From 2b848fa5ab2b2edf7fcdab24824ad2bcd00e7564 Mon Sep 17 00:00:00 2001
From: OSCAL GitHub Actions Bot <oscal@nist.gov>
Date: Tue, 11 Jul 2023 12:45:21 +0000
Subject: [PATCH] Publishing generated metaschema resources [ci skip]

---
 ..._assessment-plan_xml-to-json-converter.xsl |  3606 +-
 ...sessment-results_xml-to-json-converter.xsl |  6310 +--
 .../oscal_catalog_xml-to-json-converter.xsl   |  2786 +-
 .../oscal_complete_xml-to-json-converter.xsl  | 30555 ++++++++------
 .../oscal_component_xml-to-json-converter.xsl |  2363 +-
 .../oscal_mapping_xml-to-json-converter.xsl   |  2526 ++
 .../oscal_poam_xml-to-json-converter.xsl      |  5231 ++-
 .../oscal_profile_xml-to-json-converter.xsl   |  2782 +-
 .../oscal_ssp_xml-to-json-converter.xsl       |  4005 +-
 json/schema/oscal_assessment-plan_schema.json |  5832 +--
 .../oscal_assessment-results_schema.json      |  6193 +--
 json/schema/oscal_catalog_schema.json         |  2237 +-
 json/schema/oscal_complete_schema.json        | 10340 ++---
 json/schema/oscal_component_schema.json       |  3207 +-
 json/schema/oscal_mapping_schema.json         |   946 +
 json/schema/oscal_poam_schema.json            |  5952 +--
 json/schema/oscal_profile_schema.json         |  2578 +-
 json/schema/oscal_ssp_schema.json             |  4253 +-
 ..._assessment-plan_json-to-xml-converter.xsl |  3448 +-
 ...sessment-results_json-to-xml-converter.xsl |  6344 +--
 .../oscal_catalog_json-to-xml-converter.xsl   |  2736 +-
 .../oscal_complete_json-to-xml-converter.xsl  | 34171 +++++++++-------
 .../oscal_component_json-to-xml-converter.xsl |  2143 +-
 .../oscal_mapping_json-to-xml-converter.xsl   |  2571 ++
 .../oscal_poam_json-to-xml-converter.xsl      |  5150 ++-
 .../oscal_profile_json-to-xml-converter.xsl   |  2637 +-
 .../oscal_ssp_json-to-xml-converter.xsl       |  3805 +-
 xml/schema/oscal_assessment-plan_schema.xsd   |  2420 +-
 .../oscal_assessment-results_schema.xsd       |  2656 +-
 xml/schema/oscal_catalog_schema.xsd           |  1607 +-
 xml/schema/oscal_complete_schema.xsd          |  4869 ++-
 xml/schema/oscal_component_schema.xsd         |  1630 +-
 xml/schema/oscal_mapping_schema.xsd           |  1812 +
 xml/schema/oscal_poam_schema.xsd              |  2464 +-
 xml/schema/oscal_profile_schema.xsd           |  1881 +-
 xml/schema/oscal_ssp_schema.xsd               |  2150 +-
 36 files changed, 103810 insertions(+), 82386 deletions(-)
 create mode 100644 json/convert/oscal_mapping_xml-to-json-converter.xsl
 create mode 100644 json/schema/oscal_mapping_schema.json
 create mode 100644 xml/convert/oscal_mapping_json-to-xml-converter.xsl
 create mode 100644 xml/schema/oscal_mapping_schema.xsd

diff --git a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
index 4ae3556eab..d6414877b8 100644
--- a/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
+++ b/json/convert/oscal_assessment-plan_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,12 +76,12 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="assessment-plan metadata revision prop link role location address party responsible-party import-ssp local-definitions component status responsible-role protocol port-range inventory-item implemented-component user authorized-privilege objectives-and-methods part activity step reviewed-controls control-selection include-all include-control exclude-control control-objective-selection include-objective exclude-objective related-controls terms-and-conditions assessment-subject include-subject exclude-subject assessment-assets assessment-platform uses-component task timing on-date within-date-range at-frequency dependency associated-activity subject back-matter resource citation rlink"/>
+   <xsl:strip-space elements="assessment-plan metadata revision prop link role location address party responsible-party action import-ssp local-definitions component status responsible-role protocol port-range inventory-item implemented-component user authorized-privilege objectives-and-methods part activity step reviewed-controls control-selection include-all include-control exclude-control control-objective-selection include-objective exclude-objective related-controls terms-and-conditions assessment-subject include-subject exclude-subject assessment-assets assessment-platform uses-component task timing on-date within-date-range at-frequency dependency associated-activity subject back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="assessment-plan"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-plan" key="assessment-plan" gi="assessment-plan">
          <xsl:if test="$with-key">
@@ -115,7 +115,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -176,11 +176,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -188,67 +195,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -271,21 +239,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -300,65 +261,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -368,7 +272,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-ssp"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
@@ -379,7 +283,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -420,7 +324,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="responsible-role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
@@ -449,7 +353,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="protocol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
@@ -465,7 +369,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="port-range"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
@@ -474,7 +378,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="inventory-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
@@ -511,7 +415,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="user"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
@@ -550,7 +454,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="authorized-privilege"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
@@ -565,7 +469,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="objectives-and-methods"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="@control-id"/>
@@ -595,7 +499,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="objectives-and-methods/part | objectives-and-methods/part//part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
@@ -611,17 +515,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -643,7 +547,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="terms-and-conditions/part | terms-and-conditions/part//part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="@uuid"/>
@@ -659,17 +563,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -691,7 +595,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="activity"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="activity" gi="activity">
          <xsl:apply-templates select="@uuid"/>
@@ -730,11 +634,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="reviewed-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="reviewed-controls"
-                key="reviewed-controls"
-                gi="reviewed-controls">
+                 key="reviewed-controls"
+                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
          </xsl:if>
@@ -771,41 +675,41 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-all"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
    <xsl:template match="include-objective"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="include-objective">
+                 name="select-objective-by-id"
+                 gi="include-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-objective"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="exclude-objective">
+                 name="select-objective-by-id"
+                 gi="exclude-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
    </xsl:template>
    <xsl:template match="related-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="reviewed-controls"
-                key="related-controls"
-                gi="related-controls">
+                 key="related-controls"
+                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
          </xsl:if>
@@ -842,7 +746,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-subject" gi="assessment-subject">
          <xsl:apply-templates select="@type"/>
@@ -880,7 +784,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -903,7 +807,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -926,11 +830,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-assets"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-assets"
-                key="assessment-assets"
-                gi="assessment-assets">
+                 key="assessment-assets"
+                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
          </xsl:if>
@@ -951,7 +855,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="task" gi="task">
          <xsl:apply-templates select="@uuid"/>
@@ -1012,7 +916,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
@@ -1050,7 +954,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -1066,80 +970,80 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="role-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="function-performed"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -1149,689 +1053,770 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-ssp/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-role/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@start"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@end"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@transport"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="inventory-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="user/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="objectives-and-methods/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="activity/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-plan/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/reviewed-controls/control-selection/exclude-control/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-objective/@objective-id | exclude-objective/@objective-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="objective-id"
-            key="objective-id"
-            gi="objective-id">
+             as-type="token"
+             name="objective-id"
+             key="objective-id"
+             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-subject/@type | subject/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@subject-uuid | exclude-subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@type | exclude-subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="task/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="task/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/on-date/@date"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/within-date-range/@start"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/within-date-range/@end"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/at-frequency/@period"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/at-frequency/@unit"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/dependency/@task-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/@activity-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1841,15 +1826,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1859,15 +1844,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1877,15 +1862,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1895,15 +1880,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1913,8 +1898,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -1940,14 +1925,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1955,15 +1940,15 @@
       </group>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1973,15 +1958,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1991,15 +1976,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2009,15 +1994,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2027,15 +2012,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2045,15 +2030,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2063,13 +2048,13 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -2077,15 +2062,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2094,16 +2079,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="assessment-plan/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="assessment-plan/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2113,15 +2124,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2131,37 +2142,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2170,16 +2181,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="assessment-plan/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2189,8 +2246,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -2211,29 +2268,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2243,15 +2300,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2261,15 +2318,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2279,15 +2336,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2297,27 +2354,27 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -2325,29 +2382,30 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2356,16 +2414,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="assessment-plan/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2375,15 +2501,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2393,13 +2519,13 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -2407,15 +2533,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2425,27 +2551,27 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -2453,8 +2579,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -2472,29 +2598,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2504,15 +2630,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2522,15 +2648,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2540,15 +2666,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2558,29 +2684,65 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2590,12 +2752,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -2638,15 +2800,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2656,37 +2818,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -2696,15 +2858,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2714,8 +2876,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -2726,15 +2888,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2744,15 +2906,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2762,37 +2924,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2802,15 +2964,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2820,8 +2982,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -2850,15 +3012,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2868,15 +3030,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2886,15 +3048,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/user/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2904,15 +3066,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/user/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2922,37 +3084,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/user/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/user/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2962,15 +3124,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/user/authorized-privilege/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2980,59 +3142,59 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/user/authorized-privilege/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/objectives-and-methods/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/objectives-and-methods/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3042,15 +3204,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3060,15 +3222,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3078,15 +3240,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3096,37 +3258,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3136,8 +3298,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="step" gi="step">
          <xsl:apply-templates select="@uuid"/>
@@ -3169,15 +3331,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3187,37 +3349,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3227,37 +3389,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3267,8 +3429,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -3305,37 +3467,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3345,8 +3507,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3360,22 +3522,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3389,22 +3551,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -3441,37 +3603,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3481,15 +3643,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3499,37 +3661,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3539,8 +3701,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -3577,37 +3739,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3617,8 +3779,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3632,22 +3794,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3661,22 +3823,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -3713,37 +3875,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3753,15 +3915,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3771,12 +3933,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/terms-and-conditions"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="terms-and-conditions"
-                key="terms-and-conditions"
-                gi="terms-and-conditions">
+                 key="terms-and-conditions"
+                 gi="terms-and-conditions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
          </xsl:if>
@@ -3790,15 +3952,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/terms-and-conditions//part/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3808,15 +3970,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/terms-and-conditions//part/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3826,37 +3988,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/description"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3866,8 +4028,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -3904,37 +4066,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3944,8 +4106,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection/include-control"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3959,22 +4121,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection/exclude-control"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3988,22 +4150,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -4040,37 +4202,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4080,37 +4242,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-subject/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-subject/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4120,15 +4282,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-subject/include-subject/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4138,15 +4300,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-subject/exclude-subject/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4156,15 +4318,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4174,37 +4336,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -4214,15 +4376,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4232,8 +4394,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -4244,15 +4406,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4262,15 +4424,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4280,8 +4442,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="@uuid"/>
@@ -4311,15 +4473,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4329,15 +4491,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4347,8 +4509,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -4377,15 +4539,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4395,15 +4557,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4413,15 +4575,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4431,37 +4593,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4471,8 +4633,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
@@ -4484,8 +4646,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/on-date"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
@@ -4495,13 +4657,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/within-date-range"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -4510,13 +4672,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/at-frequency"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -4525,8 +4687,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan//task/dependency"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
@@ -4534,8 +4696,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
@@ -4571,15 +4733,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4589,15 +4751,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/responsible-role/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4607,37 +4769,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/subject/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4647,15 +4809,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/subject/include-subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4665,15 +4827,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4683,37 +4845,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/subject/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/subject/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4723,15 +4885,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/subject/include-subject/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4741,15 +4903,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/subject/exclude-subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4759,15 +4921,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan//task/responsible-role/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4777,8 +4939,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -4811,15 +4973,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4829,35 +4991,35 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -4865,8 +5027,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -4890,15 +5052,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4908,15 +5070,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4926,8 +5088,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -4942,14 +5104,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -4961,10 +5123,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -4972,43 +5134,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -5026,10 +5188,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -5038,33 +5200,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -5074,24 +5236,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -5099,12 +5261,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -5117,46 +5279,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -5165,18 +5327,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -5184,40 +5346,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -5231,19 +5393,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -5252,24 +5414,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -5279,9 +5441,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -5291,49 +5453,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -5342,9 +5504,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
index 73b5a09c33..7f9bc3a1e8 100644
--- a/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
+++ b/json/convert/oscal_assessment-results_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,16 +76,16 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="assessment-results metadata revision prop link role location address party responsible-party import-ap local-definitions objectives-and-methods part activity step reviewed-controls control-selection include-all include-control exclude-control control-objective-selection include-objective exclude-objective responsible-role related-controls result component status protocol port-range inventory-item implemented-component user authorized-privilege assessment-assets assessment-platform uses-component assessment-task timing on-date within-date-range at-frequency dependency task associated-activity subject include-subject exclude-subject attestation assessment-log entry logged-by related-task identified-subject observation origin actor relevant-evidence risk characterization facet mitigating-factor response required-asset risk-log related-response related-observation finding target implementation-status associated-risk back-matter resource citation rlink"/>
+   <xsl:strip-space elements="assessment-results metadata revision prop link role location address party responsible-party action import-ap local-definitions objectives-and-methods part activity step reviewed-controls control-selection include-all include-control exclude-control control-objective-selection include-objective exclude-objective responsible-role related-controls result component status protocol port-range inventory-item implemented-component user authorized-privilege assessment-assets assessment-platform uses-component assessment-task timing on-date within-date-range at-frequency dependency task associated-activity subject include-subject exclude-subject attestation assessment-log entry logged-by related-task identified-subject observation origin actor relevant-evidence risk characterization facet mitigating-factor response required-asset risk-log related-response related-observation finding target implementation-status associated-risk back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="assessment-results"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-results"
-                key="assessment-results"
-                gi="assessment-results">
+                 key="assessment-results"
+                 gi="assessment-results">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
          </xsl:if>
@@ -107,7 +107,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -168,11 +168,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -180,67 +187,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -263,21 +231,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -292,65 +253,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -360,7 +264,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-ap"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-ap" key="import-ap" gi="import-ap">
          <xsl:if test="$with-key">
@@ -371,7 +275,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="objectives-and-methods"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="@control-id"/>
@@ -401,7 +305,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="objectives-and-methods/part | objectives-and-methods/part//part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
@@ -417,17 +321,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -449,7 +353,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="attestation/part | attestation/part//part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="@uuid"/>
@@ -465,17 +369,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -497,7 +401,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="activity"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="activity" gi="activity">
          <xsl:apply-templates select="@uuid"/>
@@ -536,11 +440,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="reviewed-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="reviewed-controls"
-                key="reviewed-controls"
-                gi="reviewed-controls">
+                 key="reviewed-controls"
+                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
          </xsl:if>
@@ -577,37 +481,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-all"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
    <xsl:template match="include-objective"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="include-objective">
+                 name="select-objective-by-id"
+                 gi="include-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-objective"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="exclude-objective">
+                 name="select-objective-by-id"
+                 gi="exclude-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
    </xsl:template>
    <xsl:template match="responsible-role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
@@ -636,11 +540,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="related-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="reviewed-controls"
-                key="related-controls"
-                gi="related-controls">
+                 key="related-controls"
+                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
          </xsl:if>
@@ -677,7 +581,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="result"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="result" gi="result">
          <xsl:apply-templates select="@uuid"/>
@@ -734,7 +638,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -775,7 +679,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="protocol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
@@ -791,7 +695,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="port-range"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
@@ -800,7 +704,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="inventory-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
@@ -837,7 +741,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="user"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
@@ -876,7 +780,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="authorized-privilege"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
@@ -891,11 +795,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-assets"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-assets"
-                key="assessment-assets"
-                gi="assessment-assets">
+                 key="assessment-assets"
+                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
          </xsl:if>
@@ -916,7 +820,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="task" gi="assessment-task">
          <xsl:apply-templates select="@uuid"/>
@@ -977,7 +881,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly recursive="true" name="task" gi="task">
          <xsl:apply-templates select="assessment-task"/>
@@ -1040,7 +944,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
@@ -1078,7 +982,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -1101,7 +1005,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -1124,7 +1028,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="logged-by"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="@party-uuid"/>
@@ -1132,7 +1036,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="related-task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="@task-uuid"/>
@@ -1169,7 +1073,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="observation"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="observation" gi="observation">
          <xsl:apply-templates select="@uuid"/>
@@ -1230,7 +1134,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="origin"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
@@ -1253,7 +1157,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="actor"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="@type"/>
@@ -1276,7 +1180,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="risk"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="risk" gi="risk">
          <xsl:apply-templates select="@uuid"/>
@@ -1345,7 +1249,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="characterization"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="characterization" gi="characterization">
          <xsl:for-each-group select="prop" group-by="true()">
@@ -1373,7 +1277,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="finding"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="finding" gi="finding">
          <xsl:apply-templates select="@uuid"/>
@@ -1420,7 +1324,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="target"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="finding-target" key="target" gi="target">
          <xsl:if test="$with-key">
@@ -1450,11 +1354,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="implementation-status"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implementation-status"
-                key="implementation-status"
-                gi="implementation-status">
+                 key="implementation-status"
+                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
          </xsl:if>
@@ -1463,7 +1367,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -1479,87 +1383,87 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="role-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="function-performed"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="status"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status"
-             gi="status"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status"
+              gi="status"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -1569,7 +1473,7 @@
       </field>
    </xsl:template>
    <xsl:template match="threat-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="@system"/>
@@ -1580,14 +1484,14 @@
       </field>
    </xsl:template>
    <xsl:template match="status-change"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status-change"
-             gi="status-change"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status-change"
+              gi="status-change"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
@@ -1597,7 +1501,7 @@
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -1607,1072 +1511,1153 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="import-ap/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="objectives-and-methods/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="part/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+   <xsl:template match="import-ap/@href"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="objectives-and-methods/@control-id"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="part/@id"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="part/@name"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="part/@ns"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="part/@class"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="activity/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-results/result/reviewed-controls/control-selection/include-control/@control-id | assessment-results/result/reviewed-controls/control-selection/exclude-control/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-objective/@objective-id | exclude-objective/@objective-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="objective-id"
-            key="objective-id"
-            gi="objective-id">
+             as-type="token"
+             name="objective-id"
+             key="objective-id"
+             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-role/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="result/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@start"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@end"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@transport"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="inventory-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="user/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-task/@uuid | task/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-task/@type | task/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="subject/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@subject-uuid | exclude-subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@type | exclude-subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="logged-by/@party-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="party-uuid"
-            key="party-uuid"
-            gi="party-uuid">
+             as-type="uuid"
+             name="party-uuid"
+             key="party-uuid"
+             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="logged-by/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="related-task/@task-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-placeholder-uuid"
-            key="subject-placeholder-uuid"
-            gi="subject-placeholder-uuid">
+             as-type="uuid"
+             name="subject-placeholder-uuid"
+             key="subject-placeholder-uuid"
+             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="observation/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@actor-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="actor-uuid"
-            key="actor-uuid"
-            gi="actor-uuid">
+             as-type="uuid"
+             name="actor-uuid"
+             key="actor-uuid"
+             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject/@subject-uuid | assessment-results/result/risk/mitigating-factor/subject/@subject-uuid | assessment-results/result/risk/response/required-asset/subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject/@type | assessment-results/result/risk/mitigating-factor/subject/@type | assessment-results/result/risk/response/required-asset/subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/relevant-evidence/@href"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="risk/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="threat-id/@system"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="threat-id/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/@name"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/@system"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/@value"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/@implementation-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="implementation-uuid"
-            key="implementation-uuid"
-            gi="implementation-uuid">
+             as-type="uuid"
+             name="implementation-uuid"
+             key="implementation-uuid"
+             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/@lifecycle"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="lifecycle"
-            key="lifecycle"
-            gi="lifecycle">
+             as-type="token"
+             name="lifecycle"
+             key="lifecycle"
+             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/@uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/@uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="response-uuid"
-            key="response-uuid"
-            gi="response-uuid">
+             as-type="uuid"
+             name="response-uuid"
+             key="response-uuid"
+             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/related-observation/@observation-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="finding/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="target/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="target/@target-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="target-id"
-            key="target-id"
-            gi="target-id">
+             as-type="token"
+             name="target-id"
+             key="target-id"
+             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/target/status/@state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/target/status/@reason"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="reason"
-            key="reason"
-            gi="reason">
+             as-type="token"
+             name="reason"
+             key="reason"
+             gi="reason">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="implementation-status/@state"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/related-observation/@observation-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/associated-risk/@risk-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2682,15 +2667,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -2700,15 +2685,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2718,15 +2703,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2736,15 +2721,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2754,8 +2739,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -2781,14 +2766,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2796,15 +2781,15 @@
       </group>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2814,15 +2799,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -2832,15 +2817,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2850,15 +2835,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2868,15 +2853,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2886,15 +2871,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2904,13 +2889,13 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -2918,15 +2903,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2935,16 +2920,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="assessment-results/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="assessment-results/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2954,15 +2965,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2972,37 +2983,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3011,16 +3022,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="assessment-results/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="assessment-results/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3030,8 +3087,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -3052,29 +3109,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -3084,15 +3141,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -3102,15 +3159,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -3120,15 +3177,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -3138,27 +3195,27 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -3166,29 +3223,30 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3197,16 +3255,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="assessment-results/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="assessment-results/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -3216,15 +3342,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -3234,13 +3360,13 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -3248,15 +3374,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3266,27 +3392,27 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -3294,8 +3420,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -3313,29 +3439,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -3345,15 +3471,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -3363,15 +3489,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -3381,15 +3507,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -3399,29 +3525,65 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3431,12 +3593,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -3458,37 +3620,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/objectives-and-methods/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/objectives-and-methods/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3498,15 +3660,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3516,15 +3678,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3534,15 +3696,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3552,37 +3714,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3592,8 +3754,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="step" gi="step">
          <xsl:apply-templates select="@uuid"/>
@@ -3625,15 +3787,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3643,37 +3805,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3683,37 +3845,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3723,8 +3885,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -3761,37 +3923,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3801,8 +3963,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3816,22 +3978,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -3845,22 +4007,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -3897,37 +4059,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3937,15 +4099,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/step/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3955,37 +4117,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3995,8 +4157,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -4033,37 +4195,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4073,8 +4235,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -4088,22 +4250,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -4117,22 +4279,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -4169,37 +4331,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4209,15 +4371,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/local-definitions/activity/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4227,15 +4389,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4245,37 +4407,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/start"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -4285,15 +4447,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/end"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -4303,15 +4465,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4321,12 +4483,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -4362,15 +4524,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4380,37 +4542,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/purpose"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -4420,15 +4582,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4438,8 +4600,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/status"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -4450,15 +4612,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4468,15 +4630,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/component/protocol/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4486,37 +4648,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4526,15 +4688,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4544,8 +4706,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -4574,15 +4736,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4592,15 +4754,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4610,15 +4772,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/user/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4628,15 +4790,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/user/short-name"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -4646,37 +4808,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/user/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/user/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4686,15 +4848,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/user/authorized-privilege/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4704,37 +4866,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/user/authorized-privilege/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4744,37 +4906,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/purpose"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -4784,15 +4946,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4802,8 +4964,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/status"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -4814,15 +4976,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4832,15 +4994,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4850,8 +5012,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-platform" gi="assessment-platform">
          <xsl:apply-templates select="@uuid"/>
@@ -4881,15 +5043,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4899,15 +5061,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4917,8 +5079,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="uses-component" gi="uses-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -4947,15 +5109,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4965,15 +5127,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4983,15 +5145,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5001,37 +5163,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5041,8 +5203,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
@@ -5054,8 +5216,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/on-date"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
@@ -5065,13 +5227,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -5080,13 +5242,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -5095,8 +5257,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/dependency"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
@@ -5104,8 +5266,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
@@ -5141,15 +5303,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5159,15 +5321,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5177,37 +5339,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5217,15 +5379,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5235,15 +5397,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5253,37 +5415,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5293,15 +5455,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5311,15 +5473,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5329,15 +5491,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5347,37 +5509,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5387,8 +5549,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -5425,37 +5587,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5465,8 +5627,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection/include-control"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -5480,22 +5642,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection/exclude-control"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -5509,22 +5671,22 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -5561,37 +5723,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5601,8 +5763,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/attestation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="attestation" gi="attestation">
          <xsl:for-each-group select="responsible-party" group-by="true()">
@@ -5622,15 +5784,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/attestation/responsible-party/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5640,15 +5802,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/attestation//part/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5658,15 +5820,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/attestation//part/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5676,8 +5838,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
          <xsl:if test="$with-key">
@@ -5693,8 +5855,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
@@ -5734,15 +5896,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5752,37 +5914,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/start"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -5792,15 +5954,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/end"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -5810,15 +5972,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5828,15 +5990,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5846,15 +6008,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5864,37 +6026,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5904,15 +6066,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5922,15 +6084,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5940,12 +6102,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -5960,37 +6122,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6000,15 +6162,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6018,15 +6180,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6036,15 +6198,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6054,37 +6216,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6094,43 +6256,43 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/method"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6140,15 +6302,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6158,15 +6320,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6176,37 +6338,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6216,15 +6378,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6234,15 +6396,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6252,12 +6414,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -6272,37 +6434,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6312,15 +6474,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6330,15 +6492,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6348,8 +6510,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -6373,15 +6535,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6391,15 +6553,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6409,8 +6571,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/relevant-evidence"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="@href"/>
@@ -6433,37 +6595,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/relevant-evidence/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/relevant-evidence/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6473,15 +6635,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/collected"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
@@ -6491,15 +6653,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/expires"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expires</xsl:attribute>
          </xsl:if>
@@ -6509,15 +6671,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6527,59 +6689,59 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/statement"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6589,15 +6751,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6607,15 +6769,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6625,15 +6787,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6643,37 +6805,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6683,15 +6845,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6701,15 +6863,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6719,12 +6881,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -6739,37 +6901,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6779,15 +6941,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6797,15 +6959,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6815,15 +6977,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6833,15 +6995,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/actor/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6851,15 +7013,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6869,15 +7031,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6887,37 +7049,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6927,15 +7089,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6945,15 +7107,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6963,12 +7125,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -6983,37 +7145,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7023,15 +7185,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7041,15 +7203,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7059,8 +7221,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="facet" gi="facet">
          <xsl:apply-templates select="@name"/>
@@ -7084,15 +7246,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7102,8 +7264,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="@uuid"/>
@@ -7133,37 +7295,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7173,8 +7335,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -7198,15 +7360,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/subject/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7216,15 +7378,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7234,15 +7396,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/deadline"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">deadline</xsl:attribute>
          </xsl:if>
@@ -7252,8 +7414,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="response" gi="response">
          <xsl:apply-templates select="@uuid"/>
@@ -7299,15 +7461,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7317,37 +7479,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7357,15 +7519,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/actor/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7375,15 +7537,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7393,15 +7555,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7411,37 +7573,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7451,15 +7613,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7469,15 +7631,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7487,12 +7649,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -7507,37 +7669,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7547,15 +7709,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="21"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="21"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7565,15 +7727,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7583,8 +7745,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
@@ -7615,8 +7777,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/subject"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -7640,15 +7802,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/subject/title"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7658,15 +7820,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7676,15 +7838,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7694,37 +7856,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7734,15 +7896,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7752,37 +7914,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7792,8 +7954,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/timing"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
@@ -7805,8 +7967,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/timing/on-date"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
@@ -7816,13 +7978,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/timing/within-date-range"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -7831,13 +7993,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/timing/at-frequency"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -7846,8 +8008,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/dependency"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
@@ -7855,8 +8017,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
@@ -7892,15 +8054,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7910,15 +8072,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7928,37 +8090,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7968,15 +8130,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7986,15 +8148,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8004,37 +8166,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8044,15 +8206,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8062,15 +8224,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8080,15 +8242,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response//task/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8098,8 +8260,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
@@ -8115,8 +8277,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
@@ -8157,15 +8319,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8175,37 +8337,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/start"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -8215,15 +8377,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/end"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -8233,15 +8395,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8251,8 +8413,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="@response-uuid"/>
@@ -8281,15 +8443,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8299,15 +8461,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8317,15 +8479,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8335,37 +8497,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8375,15 +8537,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text"
-                 priority="21"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="21"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8393,15 +8555,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8411,12 +8573,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -8431,37 +8593,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8471,15 +8633,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="22"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="22"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8489,15 +8651,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="21"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="21"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8507,23 +8669,23 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/related-observation"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8533,37 +8695,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8573,15 +8735,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8591,15 +8753,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8609,15 +8771,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8627,37 +8789,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8667,15 +8829,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8685,15 +8847,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8703,12 +8865,12 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -8723,37 +8885,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8763,15 +8925,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8781,15 +8943,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8799,15 +8961,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/target/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8817,37 +8979,37 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/target/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/target/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8857,8 +9019,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/target/status"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -8870,15 +9032,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/implementation-statement-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="implementation-statement-uuid"
-             key="implementation-statement-uuid"
-             gi="implementation-statement-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
          </xsl:if>
@@ -8888,24 +9050,24 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/related-observation"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/result/finding/associated-risk"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -8938,15 +9100,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8956,35 +9118,35 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -8992,8 +9154,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -9017,15 +9179,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9035,15 +9197,15 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9053,8 +9215,8 @@
       </field>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -9069,14 +9231,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -9088,10 +9250,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -9099,43 +9261,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -9153,10 +9315,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -9165,33 +9327,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -9201,24 +9363,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -9226,12 +9388,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -9244,46 +9406,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -9292,18 +9454,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -9311,40 +9473,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -9358,19 +9520,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -9379,24 +9541,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -9406,9 +9568,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -9418,49 +9580,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -9469,9 +9631,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_catalog_xml-to-json-converter.xsl b/json/convert/oscal_catalog_xml-to-json-converter.xsl
index e125fc2934..bfdc9adfe4 100644
--- a/json/convert/oscal_catalog_xml-to-json-converter.xsl
+++ b/json/convert/oscal_catalog_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,12 +76,12 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="catalog metadata revision prop link role location address party responsible-party param constraint test guideline select control part group back-matter resource citation rlink"/>
+   <xsl:strip-space elements="catalog metadata revision prop link role location address party responsible-party action param constraint test guideline select control part mapping target-resource map source target group back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="catalog"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="catalog" key="catalog" gi="catalog">
          <xsl:if test="$with-key">
@@ -117,7 +117,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -178,11 +178,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -190,67 +197,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -273,21 +241,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -302,65 +263,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -370,7 +274,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="param"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter" gi="param">
          <xsl:apply-templates select="@id"/>
@@ -418,7 +322,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="constraint"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="description"/>
@@ -432,21 +336,21 @@
       </assembly>
    </xsl:template>
    <xsl:template match="guideline"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-guideline" gi="guideline">
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -454,7 +358,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="select"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
@@ -471,7 +375,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="control"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control" gi="control">
          <xsl:apply-templates select="@id"/>
@@ -505,6 +409,7 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="mapping"/>
          <xsl:for-each-group select="control" group-by="true()">
             <group in-json="ARRAY" key="controls">
                <xsl:apply-templates select="current-group()">
@@ -515,7 +420,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
@@ -531,17 +436,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -562,8 +467,118 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
+   <xsl:template match="target-resource"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-resource-reference"
+                 key="target-resource"
+                 gi="target-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@href"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="map" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="map" gi="map">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="relationship"/>
+         <xsl:for-each-group select="source" group-by="true()">
+            <group in-json="ARRAY" key="sources">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="target" group-by="true()">
+            <group in-json="ARRAY" key="targets">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="source"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-item" gi="source">
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@id-ref"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="target"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-item" gi="target">
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@id-ref"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="group"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
@@ -614,7 +629,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -630,67 +645,67 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="value"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="parameter-value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="parameter-value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -700,380 +715,534 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@depends-on"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="select/@how-many"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="how-many"
-            key="how-many"
-            gi="how-many">
+             as-type="token"
+             name="how-many"
+             key="how-many"
+             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="control/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="control/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/@uuid | catalog//group//control/mapping/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="target-resource/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="target-resource/@href"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="map/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/relationship/@ns | catalog//group//control/mapping/map/relationship/@ns"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source/@type | target/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source/@id-ref | target/@id-ref"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="id-ref"
+             key="id-ref"
+             gi="id-ref">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1083,15 +1252,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1101,15 +1270,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1119,15 +1288,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1137,15 +1306,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1155,8 +1324,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -1182,14 +1351,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1197,15 +1366,15 @@
       </group>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1215,15 +1384,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1233,15 +1402,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1251,15 +1420,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1269,15 +1438,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1287,15 +1456,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1305,13 +1474,13 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -1319,15 +1488,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1336,16 +1505,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="catalog/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="catalog/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1355,15 +1550,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1373,37 +1568,37 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1412,16 +1607,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="catalog/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="catalog/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1431,8 +1672,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -1453,29 +1694,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1485,15 +1726,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1503,15 +1744,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1521,15 +1762,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1539,27 +1780,27 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -1567,29 +1808,30 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1598,16 +1840,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="catalog/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="catalog/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -1617,15 +1927,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1635,13 +1945,13 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -1649,15 +1959,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1667,27 +1977,27 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -1695,8 +2005,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -1714,29 +2024,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1746,15 +2056,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1764,15 +2074,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1782,15 +2092,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1800,29 +2110,65 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1832,15 +2178,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1850,15 +2196,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/label"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -1868,52 +2214,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/usage"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/test"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -1921,15 +2267,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/test/expression"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -1939,29 +2285,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/select/choice"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1971,15 +2317,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1989,15 +2335,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/label"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2007,52 +2353,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/usage"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/constraint/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/constraint/test"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -2060,15 +2406,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog//control/param/constraint/test/expression"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2078,29 +2424,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/select/choice"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2110,15 +2456,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control//part/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2128,15 +2474,124 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control//part/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="target-resource"/>
+         <xsl:for-each-group select="map" group-by="true()">
+            <group in-json="ARRAY" key="maps">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/target-resource/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/relationship"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@ns"/>
+         <value as-type="token" key="type" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/source/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/target/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2146,15 +2601,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2164,15 +2619,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2182,15 +2637,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/label"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2200,52 +2655,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/usage"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/constraint/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/constraint/test"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -2253,15 +2708,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog//group/param/constraint/test/expression"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2271,29 +2726,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/select/choice"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2303,15 +2758,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//part/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2321,15 +2776,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//part/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2339,15 +2794,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2357,15 +2812,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2375,15 +2830,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/label"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2393,52 +2848,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/usage"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/constraint/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/constraint/test"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -2446,15 +2901,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/constraint/test/expression"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2464,29 +2919,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/select/choice"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2496,15 +2951,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control//part/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2514,15 +2969,124 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control//part/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="target-resource"/>
+         <xsl:for-each-group select="map" group-by="true()">
+            <group in-json="ARRAY" key="maps">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/target-resource/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/relationship"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@ns"/>
+         <value as-type="token" key="type" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/source/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/target/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2532,8 +3096,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -2566,15 +3130,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2584,35 +3148,35 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -2620,8 +3184,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -2645,15 +3209,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2663,15 +3227,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2681,8 +3245,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -2697,14 +3261,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -2716,10 +3280,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -2727,43 +3291,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -2781,10 +3345,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -2793,33 +3357,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -2829,24 +3393,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -2854,12 +3418,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -2872,46 +3436,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -2920,18 +3484,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -2939,40 +3503,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -2986,19 +3550,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -3007,24 +3571,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -3034,9 +3598,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -3046,49 +3610,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -3097,9 +3661,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_complete_xml-to-json-converter.xsl b/json/convert/oscal_complete_xml-to-json-converter.xsl
index 887ddade54..3e21a5b344 100644
--- a/json/convert/oscal_complete_xml-to-json-converter.xsl
+++ b/json/convert/oscal_complete_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,12 +76,12 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="catalog metadata revision prop link role location address party responsible-party param constraint test guideline select control part group back-matter resource citation rlink profile import include-all include-controls matching exclude-controls merge combine flat custom insert-controls modify set-parameter alter remove add component-definition import-component-definition component responsible-role protocol port-range control-implementation implemented-requirement statement capability incorporates-component system-security-plan import-profile system-characteristics system-information information-type categorization confidentiality-impact integrity-impact availability-impact security-impact-level status authorization-boundary diagram network-architecture data-flow system-implementation leveraged-authorization user authorized-privilege inventory-item implemented-component by-component implementation-status export provided responsibility inherited satisfied assessment-plan import-ssp local-definitions objectives-and-methods activity step reviewed-controls control-selection include-control exclude-control control-objective-selection include-objective exclude-objective related-controls terms-and-conditions assessment-subject include-subject exclude-subject assessment-assets assessment-platform uses-component task timing on-date within-date-range at-frequency dependency associated-activity subject assessment-results import-ap result assessment-task attestation assessment-log entry logged-by related-task identified-subject observation origin actor relevant-evidence risk characterization facet mitigating-factor response required-asset risk-log related-response related-observation finding target associated-risk plan-of-action-and-milestones poam-item"/>
+   <xsl:strip-space elements="catalog metadata revision prop link role location address party responsible-party action param constraint test guideline select control part mapping target-resource map source target group back-matter resource citation rlink mapping-collection source-resource profile import include-all include-controls matching exclude-controls merge combine flat custom insert-controls modify set-parameter alter remove add component-definition import-component-definition component responsible-role protocol port-range control-implementation implemented-requirement statement capability incorporates-component system-security-plan import-profile system-characteristics system-information information-type categorization confidentiality-impact integrity-impact availability-impact security-impact-level status authorization-boundary diagram network-architecture data-flow system-implementation leveraged-authorization user authorized-privilege inventory-item implemented-component by-component implementation-status export provided responsibility inherited satisfied assessment-plan import-ssp local-definitions objectives-and-methods activity step reviewed-controls control-selection include-control exclude-control control-objective-selection include-objective exclude-objective related-controls terms-and-conditions assessment-subject include-subject exclude-subject assessment-assets assessment-platform uses-component task timing on-date within-date-range at-frequency dependency associated-activity subject assessment-results import-ap result assessment-task attestation assessment-log entry logged-by related-task identified-subject observation origin actor relevant-evidence risk characterization facet mitigating-factor response required-asset risk-log related-response related-observation finding associated-risk plan-of-action-and-milestones poam-item related-finding"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="catalog"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="catalog" key="catalog" gi="catalog">
          <xsl:if test="$with-key">
@@ -117,7 +117,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -178,11 +178,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -190,67 +197,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -273,21 +241,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -302,65 +263,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -370,7 +274,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="param"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter" gi="param">
          <xsl:apply-templates select="@id"/>
@@ -418,7 +322,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="constraint"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="description"/>
@@ -432,21 +336,21 @@
       </assembly>
    </xsl:template>
    <xsl:template match="guideline"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-guideline" gi="guideline">
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -454,7 +358,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="select"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
@@ -471,7 +375,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="control"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control" gi="control">
          <xsl:apply-templates select="@id"/>
@@ -505,6 +409,7 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="mapping"/>
          <xsl:for-each-group select="control" group-by="true()">
             <group in-json="ARRAY" key="controls">
                <xsl:apply-templates select="current-group()">
@@ -515,7 +420,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="control/part | control/part//part | group/part | group/part//part | control/part | control/part//part | group/part | group/part//part | add/part | add/part//part | objectives-and-methods/part | objectives-and-methods/part//part | objectives-and-methods/part | objectives-and-methods/part//part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
@@ -531,17 +436,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -563,7 +468,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="terms-and-conditions/part | terms-and-conditions/part//part | attestation/part | attestation/part//part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-part" gi="part">
          <xsl:apply-templates select="@uuid"/>
@@ -579,17 +484,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -610,20 +515,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="catalog/group | catalog/group//group"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="target-resource"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="group" gi="group">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="@class"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="param" group-by="true()">
-            <group in-json="ARRAY" key="params">
+      <assembly name="mapping-resource-reference"
+                 key="target-resource"
+                 gi="target-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@href"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="map" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="map" gi="map">
+         <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -638,31 +561,102 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="part" group-by="true()">
-            <group in-json="ARRAY" key="parts">
+         <xsl:apply-templates select="relationship"/>
+         <xsl:for-each-group select="source" group-by="true()">
+            <group in-json="ARRAY" key="sources">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="group" group-by="true()">
-            <group in-json="ARRAY" key="groups">
+         <xsl:for-each-group select="target" group-by="true()">
+            <group in-json="ARRAY" key="targets">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="control" group-by="true()">
-            <group in-json="ARRAY" key="controls">
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="source"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-item" gi="source">
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@id-ref"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="custom/group | custom/group//group"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="map/target | map/target | map/target"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-item" gi="target">
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@id-ref"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="finding/target | finding/target"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="finding-target" key="target" gi="target">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@target-id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="status"/>
+         <xsl:apply-templates select="implementation-status"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="catalog/group | catalog/group//group"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
@@ -703,8 +697,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="insert-controls" group-by="true()">
-            <group in-json="ARRAY" key="insert-controls">
+         <xsl:for-each-group select="control" group-by="true()">
+            <group in-json="ARRAY" key="controls">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -712,24 +706,146 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="custom/group | custom/group//group"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="back-matter" key="back-matter" gi="back-matter">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">back-matter</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="resource" group-by="true()">
-            <group in-json="ARRAY" key="resources">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+      <assembly name="group" gi="group">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="param" group-by="true()">
+            <group in-json="ARRAY" key="params">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="part" group-by="true()">
+            <group in-json="ARRAY" key="parts">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="group" group-by="true()">
+            <group in-json="ARRAY" key="groups">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="insert-controls" group-by="true()">
+            <group in-json="ARRAY" key="insert-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="back-matter"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">back-matter</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="resource" group-by="true()">
+            <group in-json="ARRAY" key="resources">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-collection"
+                 key="mapping-collection"
+                 gi="mapping-collection">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping-collection</xsl:attribute>
+         </xsl:if>
+         <xsl:if test=". is /*">
+            <xsl:attribute name="namespace">http://csrc.nist.gov/ns/oscal/1.0</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="metadata"/>
+         <xsl:for-each-group select="mapping" group-by="true()">
+            <group in-json="SINGLETON_OR_ARRAY" key="mappings">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="back-matter"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping" gi="mapping" key="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="source-resource"/>
+         <xsl:apply-templates select="target-resource"/>
+         <xsl:for-each-group select="map" group-by="true()">
+            <group in-json="ARRAY" key="maps">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="source-resource"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-resource-reference"
+                 key="source-resource"
+                 gi="source-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">source-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@href"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="profile"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="profile" key="profile" gi="profile">
          <xsl:if test="$with-key">
@@ -753,7 +869,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import" gi="import">
          <xsl:apply-templates select="@href"/>
@@ -775,19 +891,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-all"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
+   <xsl:template match="matching"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="matching" gi="matching">
+         <xsl:apply-templates select="@pattern"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="merge"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="merge" key="merge" gi="merge">
          <xsl:if test="$with-key">
@@ -800,7 +923,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="insert-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="insert-controls" gi="insert-controls">
          <xsl:apply-templates select="@order"/>
@@ -822,7 +945,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="modify"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="modify" key="modify" gi="modify">
          <xsl:if test="$with-key">
@@ -844,80 +967,12 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="alter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="alter" gi="alter">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="remove" group-by="true()">
-            <group in-json="ARRAY" key="removes">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="add" group-by="true()">
-            <group in-json="ARRAY" key="adds">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="remove"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="remove" gi="remove">
-         <xsl:apply-templates select="@by-name"/>
-         <xsl:apply-templates select="@by-class"/>
-         <xsl:apply-templates select="@by-id"/>
-         <xsl:apply-templates select="@by-item-name"/>
-         <xsl:apply-templates select="@by-ns"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="add" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="add" gi="add">
-         <xsl:apply-templates select="@position"/>
-         <xsl:apply-templates select="@by-id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="param" group-by="true()">
-            <group in-json="ARRAY" key="params">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="part" group-by="true()">
-            <group in-json="ARRAY" key="parts">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
    <xsl:template match="component-definition"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="component-definition"
-                key="component-definition"
-                gi="component-definition">
+                 key="component-definition"
+                 gi="component-definition">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
          </xsl:if>
@@ -951,16 +1006,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-component-definition"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="import-component-definition"
-                gi="import-component-definition">
+                 name="import-component-definition"
+                 gi="import-component-definition">
          <xsl:apply-templates select="@href"/>
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="defined-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -1006,8 +1061,8 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-implementation/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component | local-definitions/component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-implementation/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -1048,7 +1103,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="responsible-role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
@@ -1077,7 +1132,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="protocol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
@@ -1093,7 +1148,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="port-range"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
@@ -1102,7 +1157,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="set-parameter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
@@ -1117,7 +1172,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="capability"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="capability" gi="capability">
          <xsl:apply-templates select="@uuid"/>
@@ -1155,7 +1210,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="incorporates-component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="incorporates-component" gi="incorporates-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -1163,11 +1218,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-security-plan"
-                key="system-security-plan"
-                gi="system-security-plan">
+                 key="system-security-plan"
+                 gi="system-security-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
          </xsl:if>
@@ -1184,7 +1239,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-profile"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-profile" key="import-profile" gi="import-profile">
          <xsl:if test="$with-key">
@@ -1195,11 +1250,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-characteristics"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-characteristics"
-                key="system-characteristics"
-                gi="system-characteristics">
+                 key="system-characteristics"
+                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
          </xsl:if>
@@ -1246,11 +1301,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-information"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-information"
-                key="system-information"
-                gi="system-information">
+                 key="system-information"
+                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
          </xsl:if>
@@ -1277,30 +1332,15 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="security-impact-level"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="security-impact-level"
-                key="security-impact-level"
-                gi="security-impact-level">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-impact-level</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="security-objective-confidentiality"/>
-         <xsl:apply-templates select="security-objective-integrity"/>
-         <xsl:apply-templates select="security-objective-availability"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="authorization-boundary"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="confidentiality-impact"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="authorization-boundary"
-                key="authorization-boundary"
-                gi="authorization-boundary">
+      <assembly name="impact"
+                 key="confidentiality-impact"
+                 gi="confidentiality-impact">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">authorization-boundary</xsl:attribute>
+            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -1315,22 +1355,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="diagram" group-by="true()">
-            <group in-json="ARRAY" key="diagrams">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
+         <xsl:apply-templates select="base"/>
+         <xsl:apply-templates select="selected"/>
+         <xsl:apply-templates select="adjustment-justification"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="diagram"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="integrity-impact"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="diagram" gi="diagram">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="description"/>
+      <assembly name="impact" key="integrity-impact" gi="integrity-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">integrity-impact</xsl:attribute>
+         </xsl:if>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -1345,20 +1381,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="caption"/>
-         <xsl:apply-templates select="remarks"/>
+         <xsl:apply-templates select="base"/>
+         <xsl:apply-templates select="selected"/>
+         <xsl:apply-templates select="adjustment-justification"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="network-architecture"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="availability-impact"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="network-architecture"
-                key="network-architecture"
-                gi="network-architecture">
+      <assembly name="impact" key="availability-impact" gi="availability-impact">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">network-architecture</xsl:attribute>
+            <xsl:attribute name="key">availability-impact</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -1373,18 +1407,119 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="diagram" group-by="true()">
-            <group in-json="ARRAY" key="diagrams">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
+         <xsl:apply-templates select="base"/>
+         <xsl:apply-templates select="selected"/>
+         <xsl:apply-templates select="adjustment-justification"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="security-impact-level"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="security-impact-level"
+                 key="security-impact-level"
+                 gi="security-impact-level">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">security-impact-level</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="security-objective-confidentiality"/>
+         <xsl:apply-templates select="security-objective-integrity"/>
+         <xsl:apply-templates select="security-objective-availability"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="authorization-boundary"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="authorization-boundary"
+                 key="authorization-boundary"
+                 gi="authorization-boundary">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">authorization-boundary</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="diagram" group-by="true()">
+            <group in-json="ARRAY" key="diagrams">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="diagram"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="diagram" gi="diagram">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="caption"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="network-architecture"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="network-architecture"
+                 key="network-architecture"
+                 gi="network-architecture">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">network-architecture</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="diagram" group-by="true()">
+            <group in-json="ARRAY" key="diagrams">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="data-flow"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="data-flow" key="data-flow" gi="data-flow">
          <xsl:if test="$with-key">
@@ -1416,11 +1551,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-implementation"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-implementation"
-                key="system-implementation"
-                gi="system-implementation">
+                 key="system-implementation"
+                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
          </xsl:if>
@@ -1470,7 +1605,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="user"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
@@ -1509,7 +1644,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="authorized-privilege"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
@@ -1524,7 +1659,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="inventory-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
@@ -1561,7 +1696,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="by-component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="by-component" gi="by-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -1615,11 +1750,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="implementation-status"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implementation-status"
-                key="implementation-status"
-                gi="implementation-status">
+                 key="implementation-status"
+                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
          </xsl:if>
@@ -1628,7 +1763,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-plan"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-plan" key="assessment-plan" gi="assessment-plan">
          <xsl:if test="$with-key">
@@ -1662,7 +1797,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-ssp"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
@@ -1673,7 +1808,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="objectives-and-methods"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-objective" gi="objectives-and-methods">
          <xsl:apply-templates select="@control-id"/>
@@ -1703,7 +1838,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="activity"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="activity" gi="activity">
          <xsl:apply-templates select="@uuid"/>
@@ -1742,11 +1877,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="reviewed-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="reviewed-controls"
-                key="reviewed-controls"
-                gi="reviewed-controls">
+                 key="reviewed-controls"
+                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
          </xsl:if>
@@ -1783,29 +1918,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-objective"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="include-objective">
+                 name="select-objective-by-id"
+                 gi="include-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-objective"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="exclude-objective">
+                 name="select-objective-by-id"
+                 gi="exclude-objective">
          <xsl:apply-templates select="@objective-id"/>
       </assembly>
    </xsl:template>
    <xsl:template match="related-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="reviewed-controls"
-                key="related-controls"
-                gi="related-controls">
+                 key="related-controls"
+                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
          </xsl:if>
@@ -1842,7 +1977,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-subject" gi="assessment-subject">
          <xsl:apply-templates select="@type"/>
@@ -1880,7 +2015,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -1903,7 +2038,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -1926,11 +2061,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-assets"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-assets"
-                key="assessment-assets"
-                gi="assessment-assets">
+                 key="assessment-assets"
+                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
          </xsl:if>
@@ -1951,7 +2086,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="task" gi="task">
          <xsl:apply-templates select="@uuid"/>
@@ -2012,7 +2147,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
@@ -2050,11 +2185,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-results"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-results"
-                key="assessment-results"
-                gi="assessment-results">
+                 key="assessment-results"
+                 gi="assessment-results">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
          </xsl:if>
@@ -2076,7 +2211,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-ap"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-ap" key="import-ap" gi="import-ap">
          <xsl:if test="$with-key">
@@ -2087,7 +2222,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="result"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="result" gi="result">
          <xsl:apply-templates select="@uuid"/>
@@ -2144,7 +2279,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="assessment-task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="task" gi="assessment-task">
          <xsl:apply-templates select="@uuid"/>
@@ -2205,7 +2340,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="logged-by"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="@party-uuid"/>
@@ -2213,7 +2348,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="related-task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="@task-uuid"/>
@@ -2250,7 +2385,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="observation"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="observation" gi="observation">
          <xsl:apply-templates select="@uuid"/>
@@ -2311,7 +2446,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="origin"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
@@ -2334,7 +2469,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="actor"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="@type"/>
@@ -2357,7 +2492,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="risk"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="risk" gi="risk">
          <xsl:apply-templates select="@uuid"/>
@@ -2426,7 +2561,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="characterization"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="characterization" gi="characterization">
          <xsl:for-each-group select="prop" group-by="true()">
@@ -2454,7 +2589,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="finding"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="finding" gi="finding">
          <xsl:apply-templates select="@uuid"/>
@@ -2500,42 +2635,12 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="target"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="finding-target" key="target" gi="target">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">target</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="@target-id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="status"/>
-         <xsl:apply-templates select="implementation-status"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="plan-of-action-and-milestones"
-                key="plan-of-action-and-milestones"
-                gi="plan-of-action-and-milestones">
+                 key="plan-of-action-and-milestones"
+                 gi="plan-of-action-and-milestones">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
          </xsl:if>
@@ -2561,6 +2666,13 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="finding" group-by="true()">
+            <group in-json="ARRAY" key="findings">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="poam-item" group-by="true()">
             <group in-json="ARRAY" key="poam-items">
                <xsl:apply-templates select="current-group()">
@@ -2572,11 +2684,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="local-definitions"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -2594,11 +2706,12 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="assessment-assets"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="poam-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="poam-item" gi="poam-item">
          <xsl:apply-templates select="@uuid"/>
@@ -2625,6 +2738,13 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="related-finding" group-by="true()">
+            <group in-json="ARRAY" key="related-findings">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="related-observation" group-by="true()">
             <group in-json="ARRAY" key="related-observations">
                <xsl:apply-templates select="current-group()">
@@ -2643,67 +2763,67 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="value"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="parameter-value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="parameter-value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -2712,13 +2832,26 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="with-id"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="with-id"
+              gi="with-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
    <xsl:template match="system-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-id"
-             gi="system-id">
+              as-type="string"
+              name="system-id"
+              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
          </xsl:if>
@@ -2729,40 +2862,40 @@
       </field>
    </xsl:template>
    <xsl:template match="role-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="function-performed"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="status"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status"
-             gi="status"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status"
+              gi="status"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -2772,7 +2905,7 @@
       </field>
    </xsl:template>
    <xsl:template match="threat-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="@system"/>
@@ -2783,14 +2916,14 @@
       </field>
    </xsl:template>
    <xsl:template match="status-change"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status-change"
-             gi="status-change"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status-change"
+              gi="status-change"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
@@ -2800,1804 +2933,1998 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme | profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme | component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme | system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme | assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme | assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme | plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme | mapping-collection/metadata/document-id/@scheme | mapping-collection/back-matter/resource/document-id/@scheme | profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme | component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme | system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme | assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme | assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme | plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="catalog/metadata/role/@id | mapping-collection/metadata/role/@id | profile/metadata/role/@id | component-definition/metadata/role/@id | system-security-plan/metadata/role/@id | assessment-plan/metadata/role/@id | assessment-results/metadata/role/@id | plan-of-action-and-milestones/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/location/@uuid | mapping-collection/metadata/location/@uuid | profile/metadata/location/@uuid | component-definition/metadata/location/@uuid | system-security-plan/metadata/location/@uuid | assessment-plan/metadata/location/@uuid | assessment-results/metadata/location/@uuid | plan-of-action-and-milestones/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type | profile/metadata/location/address/@type | profile/metadata/party/address/@type | component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type | system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type | assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type | assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type | plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type | mapping-collection/metadata/location/address/@type | mapping-collection/metadata/party/address/@type | profile/metadata/location/address/@type | profile/metadata/party/address/@type | component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type | system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type | assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type | assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type | plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type | profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type | component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type | system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type | assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type | assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type | plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type | mapping-collection/metadata/location/telephone-number/@type | mapping-collection/metadata/party/telephone-number/@type | profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type | component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type | system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type | assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type | assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type | plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/party/@uuid | mapping-collection/metadata/party/@uuid | profile/metadata/party/@uuid | component-definition/metadata/party/@uuid | system-security-plan/metadata/party/@uuid | assessment-plan/metadata/party/@uuid | assessment-results/metadata/party/@uuid | plan-of-action-and-milestones/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/party/@type | mapping-collection/metadata/party/@type | profile/metadata/party/@type | component-definition/metadata/party/@type | system-security-plan/metadata/party/@type | assessment-plan/metadata/party/@type | assessment-results/metadata/party/@type | plan-of-action-and-milestones/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/metadata/party/external-id/@scheme | profile/metadata/party/external-id/@scheme | component-definition/metadata/party/external-id/@scheme | system-security-plan/metadata/party/external-id/@scheme | assessment-plan/metadata/party/external-id/@scheme | assessment-results/metadata/party/external-id/@scheme | plan-of-action-and-milestones/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/party/external-id/@scheme | mapping-collection/metadata/party/external-id/@scheme | profile/metadata/party/external-id/@scheme | component-definition/metadata/party/external-id/@scheme | system-security-plan/metadata/party/external-id/@scheme | assessment-plan/metadata/party/external-id/@scheme | assessment-results/metadata/party/external-id/@scheme | plan-of-action-and-milestones/metadata/party/external-id/@scheme"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@depends-on"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="select/@how-many"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="how-many"
-            key="how-many"
-            gi="how-many">
+             as-type="token"
+             name="how-many"
+             key="how-many"
+             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="control/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="control/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/@uuid | catalog//group//control/mapping/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="target-resource/@type | source-resource/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="target-resource/@href | source-resource/@href"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="map/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/relationship/@ns | catalog//group//control/mapping/map/relationship/@ns | mapping-collection/mapping/map/relationship/@ns"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source/@type | target/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source/@id-ref | target/@id-ref"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="string"
+             name="id-ref"
+             key="id-ref"
+             gi="id-ref">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/@uuid | profile/back-matter/resource/@uuid | component-definition/back-matter/resource/@uuid | system-security-plan/back-matter/resource/@uuid | assessment-plan/back-matter/resource/@uuid | assessment-results/back-matter/resource/@uuid | plan-of-action-and-milestones/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/back-matter/resource/@uuid | mapping-collection/back-matter/resource/@uuid | profile/back-matter/resource/@uuid | component-definition/back-matter/resource/@uuid | system-security-plan/back-matter/resource/@uuid | assessment-plan/back-matter/resource/@uuid | assessment-results/back-matter/resource/@uuid | plan-of-action-and-milestones/back-matter/resource/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/rlink/@href | profile/back-matter/resource/rlink/@href | component-definition/back-matter/resource/rlink/@href | system-security-plan/back-matter/resource/rlink/@href | assessment-plan/back-matter/resource/rlink/@href | assessment-results/back-matter/resource/rlink/@href | plan-of-action-and-milestones/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/back-matter/resource/rlink/@href | mapping-collection/back-matter/resource/rlink/@href | profile/back-matter/resource/rlink/@href | component-definition/back-matter/resource/rlink/@href | system-security-plan/back-matter/resource/rlink/@href | assessment-plan/back-matter/resource/rlink/@href | assessment-results/back-matter/resource/rlink/@href | plan-of-action-and-milestones/back-matter/resource/rlink/@href"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/rlink/@media-type | profile/back-matter/resource/rlink/@media-type | component-definition/back-matter/resource/rlink/@media-type | system-security-plan/back-matter/resource/rlink/@media-type | assessment-plan/back-matter/resource/rlink/@media-type | assessment-results/back-matter/resource/rlink/@media-type | plan-of-action-and-milestones/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/back-matter/resource/rlink/@media-type | mapping-collection/back-matter/resource/rlink/@media-type | profile/back-matter/resource/rlink/@media-type | component-definition/back-matter/resource/rlink/@media-type | system-security-plan/back-matter/resource/rlink/@media-type | assessment-plan/back-matter/resource/rlink/@media-type | assessment-results/back-matter/resource/rlink/@media-type | plan-of-action-and-milestones/back-matter/resource/rlink/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/base64/@filename | profile/back-matter/resource/base64/@filename | component-definition/back-matter/resource/base64/@filename | system-security-plan/back-matter/resource/base64/@filename | assessment-plan/back-matter/resource/base64/@filename | assessment-results/back-matter/resource/base64/@filename | plan-of-action-and-milestones/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/back-matter/resource/base64/@filename | mapping-collection/back-matter/resource/base64/@filename | profile/back-matter/resource/base64/@filename | component-definition/back-matter/resource/base64/@filename | system-security-plan/back-matter/resource/base64/@filename | assessment-plan/back-matter/resource/base64/@filename | assessment-results/back-matter/resource/base64/@filename | plan-of-action-and-milestones/back-matter/resource/base64/@filename"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/base64/@media-type | profile/back-matter/resource/base64/@media-type | component-definition/back-matter/resource/base64/@media-type | system-security-plan/back-matter/resource/base64/@media-type | assessment-plan/back-matter/resource/base64/@media-type | assessment-results/back-matter/resource/base64/@media-type | plan-of-action-and-milestones/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/back-matter/resource/base64/@media-type | mapping-collection/back-matter/resource/base64/@media-type | profile/back-matter/resource/base64/@media-type | component-definition/back-matter/resource/base64/@media-type | system-security-plan/back-matter/resource/base64/@media-type | assessment-plan/back-matter/resource/base64/@media-type | assessment-results/back-matter/resource/base64/@media-type | plan-of-action-and-milestones/back-matter/resource/base64/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/import/include-controls/@with-child-controls | profile/import/exclude-controls/@with-child-controls | profile/merge/custom//group/insert-controls/include-controls/@with-child-controls | profile/merge/custom//group/insert-controls/exclude-controls/@with-child-controls | profile/merge/custom/insert-controls/include-controls/@with-child-controls | profile/merge/custom/insert-controls/exclude-controls/@with-child-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="with-child-controls"
-            key="with-child-controls"
-            gi="with-child-controls">
+             as-type="token"
+             name="with-child-controls"
+             key="with-child-controls"
+             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="profile/import/include-controls/matching/@pattern | profile/import/exclude-controls/matching/@pattern | profile/merge/custom//group/insert-controls/include-controls/matching/@pattern | profile/merge/custom//group/insert-controls/exclude-controls/matching/@pattern | profile/merge/custom/insert-controls/include-controls/matching/@pattern | profile/merge/custom/insert-controls/exclude-controls/matching/@pattern"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="matching/@pattern"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="pattern"
-            key="pattern"
-            gi="pattern">
+             as-type="string"
+             name="pattern"
+             key="pattern"
+             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/merge/combine/@method"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="method"
-            key="method"
-            gi="method">
+             as-type="string"
+             name="method"
+             key="method"
+             gi="method">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="insert-controls/@order"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="order"
-            key="order"
-            gi="order">
+             as-type="token"
+             name="order"
+             key="order"
+             gi="order">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/@param-id"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/@class"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/@depends-on"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="alter/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/@control-id"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-name"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-name"
-            key="by-name"
-            gi="by-name">
+             as-type="token"
+             name="by-name"
+             key="by-name"
+             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-class"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-class"
-            key="by-class"
-            gi="by-class">
+             as-type="token"
+             name="by-class"
+             key="by-class"
+             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-id"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-item-name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-item-name"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-item-name"
-            key="by-item-name"
-            gi="by-item-name">
+             as-type="token"
+             name="by-item-name"
+             key="by-item-name"
+             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-ns"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-ns"
-            key="by-ns"
-            gi="by-ns">
+             as-type="token"
+             name="by-ns"
+             key="by-ns"
+             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="add/@position"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/add/@position"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="position"
-            key="position"
-            gi="position">
+             as-type="token"
+             name="position"
+             key="position"
+             default="ending"
+             gi="position">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="add/@by-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/add/@by-id"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-component-definition/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="defined-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="defined-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-role/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@start"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@end"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@transport"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="source"
-            key="source"
-            gi="source">
+             as-type="uri-reference"
+             name="source"
+             key="source"
+             gi="source">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="set-parameter/@param-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/@control-id | component-definition/capability/control-implementation/implemented-requirement/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/@statement-id | component-definition/capability/control-implementation/implemented-requirement/statement/@statement-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="capability/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="capability/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="incorporates-component/@component-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-profile/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-id/@identifier-type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="identifier-type"
-            key="identifier-type"
-            gi="identifier-type">
+             as-type="uri"
+             name="identifier-type"
+             key="identifier-type"
+             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/@uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/status/@state"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="string"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="diagram/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="user/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/status/@state | assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state | assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state | plan-of-action-and-milestones/local-definitions/component/status/@state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/status/@state | assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state | assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state | plan-of-action-and-milestones/local-definitions/component/status/@state | plan-of-action-and-milestones/local-definitions/assessment-assets/component/status/@state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="inventory-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid | assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid | assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid | plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/@statement-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="by-component/@component-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="by-component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="implementation-status/@state"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@provided-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@provided-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@responsibility-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@responsibility-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="responsibility-uuid"
-            key="responsibility-uuid"
-            gi="responsibility-uuid">
+             as-type="uuid"
+             name="responsibility-uuid"
+             key="responsibility-uuid"
+             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-ssp/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="objectives-and-methods/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="activity/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/@uuid | assessment-results/local-definitions/activity/step/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-plan/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-results/result/reviewed-controls/control-selection/include-control/@control-id | assessment-results/result/reviewed-controls/control-selection/exclude-control/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-objective/@objective-id | exclude-objective/@objective-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="objective-id"
-            key="objective-id"
-            gi="objective-id">
+             as-type="token"
+             name="objective-id"
+             key="objective-id"
+             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-subject/@type | subject/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@subject-uuid | exclude-subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@type | exclude-subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/@uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/@uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid | plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid | plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="task/@uuid | assessment-task/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="task/@type | assessment-task/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/on-date/@date | assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date | plan-of-action-and-milestones/risk/response//task/timing/on-date/@date"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/within-date-range/@start | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/within-date-range/@end | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/at-frequency/@period | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/timing/at-frequency/@unit | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/dependency/@task-uuid | assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid | plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-plan//task/associated-activity/@activity-uuid | assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid | plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-ap/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="result/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/assessment-log/entry/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="logged-by/@party-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="party-uuid"
-            key="party-uuid"
-            gi="party-uuid">
+             as-type="uuid"
+             name="party-uuid"
+             key="party-uuid"
+             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="logged-by/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="related-task/@task-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/finding/origin/related-task/identified-subject/@subject-placeholder-uuid"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-placeholder-uuid"
-            key="subject-placeholder-uuid"
-            gi="subject-placeholder-uuid">
+             as-type="uuid"
+             name="subject-placeholder-uuid"
+             key="subject-placeholder-uuid"
+             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="observation/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@actor-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="actor-uuid"
-            key="actor-uuid"
-            gi="actor-uuid">
+             as-type="uuid"
+             name="actor-uuid"
+             key="actor-uuid"
+             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject/@subject-uuid | assessment-results/result/risk/mitigating-factor/subject/@subject-uuid | assessment-results/result/risk/response/required-asset/subject/@subject-uuid | plan-of-action-and-milestones/observation/subject/@subject-uuid | plan-of-action-and-milestones/risk/mitigating-factor/subject/@subject-uuid | plan-of-action-and-milestones/risk/response/required-asset/subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/subject/@type | assessment-results/result/risk/mitigating-factor/subject/@type | assessment-results/result/risk/response/required-asset/subject/@type | plan-of-action-and-milestones/observation/subject/@type | plan-of-action-and-milestones/risk/mitigating-factor/subject/@type | plan-of-action-and-milestones/risk/response/required-asset/subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/observation/relevant-evidence/@href | plan-of-action-and-milestones/observation/relevant-evidence/@href"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="risk/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="threat-id/@system"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="threat-id/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/@name | plan-of-action-and-milestones/risk/characterization/facet/@name"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/@system | plan-of-action-and-milestones/risk/characterization/facet/@system"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/characterization/facet/@value | plan-of-action-and-milestones/risk/characterization/facet/@value"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/@uuid | plan-of-action-and-milestones/risk/mitigating-factor/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/mitigating-factor/@implementation-uuid | plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="implementation-uuid"
-            key="implementation-uuid"
-            gi="implementation-uuid">
+             as-type="uuid"
+             name="implementation-uuid"
+             key="implementation-uuid"
+             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/@uuid | plan-of-action-and-milestones/risk/response/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/@lifecycle | plan-of-action-and-milestones/risk/response/@lifecycle"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="lifecycle"
-            key="lifecycle"
-            gi="lifecycle">
+             as-type="token"
+             name="lifecycle"
+             key="lifecycle"
+             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/response/required-asset/@uuid | plan-of-action-and-milestones/risk/response/required-asset/@uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/@uuid | plan-of-action-and-milestones/risk/risk-log/entry/@uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="response-uuid"
-            key="response-uuid"
-            gi="response-uuid">
+             as-type="uuid"
+             name="response-uuid"
+             key="response-uuid"
+             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="assessment-results/result/risk/related-observation/@observation-uuid | plan-of-action-and-milestones/risk/related-observation/@observation-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="finding/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="target/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="target/@target-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="target-id"
-            key="target-id"
-            gi="target-id">
+             as-type="token"
+             name="target-id"
+             key="target-id"
+             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/status/@state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/target/status/@state | plan-of-action-and-milestones/finding/target/status/@state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/status/@reason"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/target/status/@reason | plan-of-action-and-milestones/finding/target/status/@reason"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="reason"
-            key="reason"
-            gi="reason">
+             as-type="token"
+             name="reason"
+             key="reason"
+             gi="reason">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/related-observation/@observation-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/related-observation/@observation-uuid | plan-of-action-and-milestones/finding/related-observation/@observation-uuid"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/associated-risk/@risk-uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/associated-risk/@risk-uuid | plan-of-action-and-milestones/finding/associated-risk/@risk-uuid"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="poam-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/poam-item/related-finding/@finding-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="finding-uuid"
+             key="finding-uuid"
+             gi="finding-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="catalog/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4607,15 +4934,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -4625,15 +4952,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -4643,15 +4970,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -4661,15 +4988,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -4679,8 +5006,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -4706,14 +5033,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -4721,15 +5048,15 @@
       </group>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4739,15 +5066,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -4757,15 +5084,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -4775,15 +5102,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -4793,15 +5120,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -4811,15 +5138,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4829,13 +5156,13 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -4843,15 +5170,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4860,16 +5187,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="catalog/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="catalog/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4879,15 +5232,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -4897,37 +5250,37 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4936,16 +5289,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="catalog/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="catalog/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4955,8 +5354,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -4977,29 +5376,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -5009,15 +5408,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -5027,15 +5426,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -5045,15 +5444,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -5063,27 +5462,27 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -5091,29 +5490,30 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5122,16 +5522,84 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="catalog/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="catalog/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -5141,15 +5609,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -5159,13 +5627,13 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -5173,15 +5641,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5191,27 +5659,27 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -5219,8 +5687,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -5238,29 +5706,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -5270,15 +5738,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -5288,15 +5756,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -5306,15 +5774,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -5324,29 +5792,65 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5356,15 +5860,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5374,15 +5878,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/label"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -5392,52 +5896,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/usage"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/test"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -5445,15 +5949,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/param/constraint/test/expression"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -5463,29 +5967,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/param/select/choice"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5495,15 +5999,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5513,15 +6017,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/label"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -5531,52 +6035,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/usage"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/constraint/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/constraint/test"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -5584,15 +6088,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog//control/param/constraint/test/expression"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -5602,29 +6106,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/param/select/choice"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//control/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5634,15 +6138,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control//part/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5652,15 +6156,124 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//control//part/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="target-resource"/>
+         <xsl:for-each-group select="map" group-by="true()">
+            <group in-json="ARRAY" key="maps">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/target-resource/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/relationship"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@ns"/>
+         <value as-type="token" key="type" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/source/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//control/mapping/map/target/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5670,15 +6283,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5688,15 +6301,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5706,15 +6319,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/label"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -5724,52 +6337,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/usage"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/constraint/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/constraint/test"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -5777,15 +6390,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog//group/param/constraint/test/expression"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -5795,29 +6408,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/param/select/choice"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5827,15 +6440,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//part/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5845,15 +6458,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//part/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5863,15 +6476,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5881,15 +6494,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5899,15 +6512,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/label"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -5917,52 +6530,52 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/usage"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/constraint/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/constraint/test"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -5970,15 +6583,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/constraint/test/expression"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -5988,29 +6601,29 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/param/select/choice"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6020,15 +6633,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control//part/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6038,15 +6651,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog//group//control//part/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6055,88 +6668,197 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog//group//control/mapping"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="resource" gi="resource">
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="document-id" group-by="true()">
-            <group in-json="ARRAY" key="document-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="citation"/>
-         <xsl:for-each-group select="rlink" group-by="true()">
-            <group in-json="ARRAY" key="rlinks">
+         <xsl:apply-templates select="target-resource"/>
+         <xsl:for-each-group select="map" group-by="true()">
+            <group in-json="ARRAY" key="maps">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="base64"/>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog//group//control/mapping/target-resource/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="catalog/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="catalog//group//control/mapping/map/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/relationship"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@ns"/>
+         <value as-type="token" key="type" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/source/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog//group//control/mapping/map/target/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog/back-matter/resource"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="citation"/>
+         <xsl:for-each-group select="rlink" group-by="true()">
+            <group in-json="ARRAY" key="rlinks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="base64"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="catalog/back-matter/resource/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="catalog/back-matter/resource/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -6144,8 +6866,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -6169,15 +6891,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6187,15 +6909,15 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6205,8 +6927,8 @@
       </field>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -6221,14 +6943,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="catalog/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -6239,16 +6961,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6257,16 +6979,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -6275,16 +6997,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -6293,16 +7015,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -6311,16 +7033,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -6329,9 +7051,9 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -6356,31 +7078,31 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="revision"/>
       </group>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6389,16 +7111,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -6407,16 +7129,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -6425,16 +7147,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -6443,16 +7165,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -6461,16 +7183,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6479,30 +7201,30 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6511,16 +7233,42 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6529,16 +7277,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -6547,38 +7295,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6587,16 +7335,62 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6605,9 +7399,9 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -6627,30 +7421,30 @@
          <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -6659,16 +7453,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -6677,16 +7471,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -6695,16 +7489,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -6713,58 +7507,59 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6773,34 +7568,102 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -6809,30 +7672,30 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6841,37 +7704,37 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -6888,30 +7751,30 @@
          <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -6920,16 +7783,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -6938,16 +7801,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -6956,16 +7819,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -6974,30 +7837,30 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7006,185 +7869,124 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/import/include-controls"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="include-controls">
-         <xsl:apply-templates select="@with-child-controls"/>
-         <xsl:for-each-group select="with-id" group-by="true()">
-            <group in-json="ARRAY" key="with-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="matching" group-by="true()">
-            <group in-json="ARRAY" key="matching">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="profile/import/include-controls/with-id"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/import/include-controls/matching"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="profile/import/exclude-controls"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="exclude-controls">
-         <xsl:apply-templates select="@with-child-controls"/>
-         <xsl:for-each-group select="with-id" group-by="true()">
-            <group in-json="ARRAY" key="with-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="matching" group-by="true()">
-            <group in-json="ARRAY" key="matching">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="profile/import/exclude-controls/with-id"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/import/exclude-controls/matching"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="profile/merge/combine"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="combine" key="combine" gi="combine">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">combine</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@method"/>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="profile/merge/flat"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/mapping/source-resource/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="flat" key="flat" gi="flat">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">flat</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="profile/merge/as-is"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/mapping/target-resource/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="boolean"
-             name="as-is"
-             key="as-is"
-             gi="as-is"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">as-is</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="boolean" in-json="boolean">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/merge/custom"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/mapping/map/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="custom" key="custom" gi="custom">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">custom</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:for-each-group select="group" group-by="true()">
-            <group in-json="ARRAY" key="groups">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="insert-controls" group-by="true()">
-            <group in-json="ARRAY" key="insert-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/mapping/map/relationship"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <xsl:apply-templates select="@ns"/>
+         <value as-type="token" key="type" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/param/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/mapping/map/source/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7193,71 +7995,1360 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/param/label"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/mapping/map/target/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">label</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/param/usage"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="mapping-collection/back-matter/resource"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">usage</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="citation"/>
+         <xsl:for-each-group select="rlink" group-by="true()">
+            <group in-json="ARRAY" key="rlinks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="base64"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/document-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/citation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="text"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/citation/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/citation/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/rlink"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="@media-type"/>
+         <xsl:for-each-group select="hash" group-by="true()">
+            <group in-json="ARRAY" key="hashes">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/base64"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base64</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@filename"/>
+         <xsl:apply-templates select="@media-type"/>
+         <value as-type="base64Binary" key="value" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="revision"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" key="address" gi="address">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">address</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <value as-type="uri" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="id" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/import/include-controls"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="select-control-by-id" gi="include-controls">
+         <xsl:apply-templates select="@with-child-controls"/>
+         <xsl:for-each-group select="with-id" group-by="true()">
+            <group in-json="ARRAY" key="with-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="matching" group-by="true()">
+            <group in-json="ARRAY" key="matching">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/import/exclude-controls"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="select-control-by-id" gi="exclude-controls">
+         <xsl:apply-templates select="@with-child-controls"/>
+         <xsl:for-each-group select="with-id" group-by="true()">
+            <group in-json="ARRAY" key="with-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="matching" group-by="true()">
+            <group in-json="ARRAY" key="matching">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/merge/combine"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="combine" key="combine" gi="combine">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">combine</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@method"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/merge/flat"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="flat" key="flat" gi="flat">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">flat</xsl:attribute>
+         </xsl:if>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/merge/as-is"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="boolean"
+              name="as-is"
+              key="as-is"
+              gi="as-is"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">as-is</xsl:attribute>
+         </xsl:if>
+         <value as-type="boolean" in-json="boolean">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/merge/custom"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="custom" key="custom" gi="custom">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">custom</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="group" group-by="true()">
+            <group in-json="ARRAY" key="groups">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="insert-controls" group-by="true()">
+            <group in-json="ARRAY" key="insert-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/merge/custom//group/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/merge/custom//group/param/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/merge/custom//group/param/label"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">label</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/merge/custom//group/param/usage"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">usage</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/constraint/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/constraint/test"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -7265,15 +9356,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/constraint/test/expression"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -7283,29 +9374,29 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/select/choice"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7315,15 +9406,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group//part/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7333,15 +9424,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group//part/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7351,8 +9442,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/insert-controls/include-controls"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -7372,31 +9463,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/include-controls/with-id"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/include-controls/matching"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/custom//group/insert-controls/exclude-controls"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -7416,31 +9485,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/exclude-controls/with-id"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/exclude-controls/matching"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/custom/insert-controls/include-controls"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -7460,31 +9507,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/include-controls/with-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/include-controls/matching"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/custom/insert-controls/exclude-controls"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -7504,31 +9529,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/exclude-controls/with-id"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/exclude-controls/matching"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/modify/set-parameter"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
@@ -7575,15 +9578,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7593,15 +9596,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/label"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -7611,52 +9614,52 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/usage"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/constraint/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/constraint/test"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -7664,15 +9667,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/constraint/test/expression"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -7681,30 +9684,102 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="profile/modify/set-parameter/select/choice"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/set-parameter/select/choice"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/modify/alter"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="alter" gi="alter">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="remove" group-by="true()">
+            <group in-json="ARRAY" key="removes">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="add" group-by="true()">
+            <group in-json="ARRAY" key="adds">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/modify/alter/remove"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="remove" gi="remove">
+         <xsl:apply-templates select="@by-name"/>
+         <xsl:apply-templates select="@by-class"/>
+         <xsl:apply-templates select="@by-id"/>
+         <xsl:apply-templates select="@by-item-name"/>
+         <xsl:apply-templates select="@by-ns"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/modify/alter/add"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="add" gi="add">
+         <xsl:apply-templates select="@position"/>
+         <xsl:apply-templates select="@by-id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="param" group-by="true()">
+            <group in-json="ARRAY" key="params">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="part" group-by="true()">
+            <group in-json="ARRAY" key="parts">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7714,15 +9789,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7732,15 +9807,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/label"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -7750,52 +9825,52 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/usage"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/constraint/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/constraint/test"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -7803,15 +9878,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/constraint/test/expression"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -7821,29 +9896,29 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/select/choice"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7853,15 +9928,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add//part/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7871,15 +9946,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add//part/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7889,8 +9964,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -7923,15 +9998,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7941,35 +10016,35 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -7977,8 +10052,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -8002,15 +10077,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8020,15 +10095,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8038,8 +10113,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -8054,14 +10129,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -8073,15 +10148,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8091,15 +10166,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -8109,15 +10184,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -8127,15 +10202,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -8145,15 +10220,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -8163,8 +10238,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -8190,14 +10265,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -8205,15 +10280,15 @@
       </group>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8223,15 +10298,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -8241,15 +10316,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -8259,15 +10334,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -8277,15 +10352,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -8295,15 +10370,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8313,13 +10388,13 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -8327,15 +10402,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8344,16 +10419,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="component-definition/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="component-definition/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8363,15 +10464,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -8381,37 +10482,37 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8420,16 +10521,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="component-definition/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="component-definition/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8439,8 +10586,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -8461,29 +10608,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -8493,15 +10640,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -8511,15 +10658,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -8529,15 +10676,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -8547,27 +10694,27 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -8575,29 +10722,30 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8606,16 +10754,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="component-definition/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="component-definition/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -8625,15 +10841,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -8643,13 +10859,13 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -8657,15 +10873,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8675,27 +10891,27 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -8703,8 +10919,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -8722,29 +10938,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -8754,15 +10970,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -8772,15 +10988,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -8790,15 +11006,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -8808,29 +11024,65 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="component-definition/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="component-definition/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8840,15 +11092,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8858,37 +11110,37 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/purpose"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -8898,15 +11150,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8916,15 +11168,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/responsible-role/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8934,15 +11186,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/protocol/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8952,8 +11204,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
@@ -8990,37 +11242,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9030,22 +11282,22 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/set-parameter/value"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
@@ -9090,37 +11342,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9130,29 +11382,29 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9162,8 +11414,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
@@ -9194,37 +11446,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9234,15 +11486,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9252,37 +11504,37 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9292,30 +11544,30 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/incorporates-component/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
@@ -9352,37 +11604,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9392,22 +11644,22 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/set-parameter/value"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
@@ -9452,37 +11704,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9492,29 +11744,29 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9524,8 +11776,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
@@ -9556,37 +11808,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9596,15 +11848,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9614,8 +11866,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -9648,15 +11900,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -9666,35 +11918,35 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -9702,8 +11954,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -9727,15 +11979,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9745,15 +11997,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9763,8 +12015,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -9779,14 +12031,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -9797,106 +12049,409 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="revision"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="revision" gi="revision">
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="published"/>
-         <xsl:apply-templates select="last-modified"/>
-         <xsl:apply-templates select="version"/>
-         <xsl:apply-templates select="oscal-version"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -9914,31 +12469,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="revision"/>
-      </group>
-   </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -9947,120 +12487,167 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <value as-type="uri" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10069,34 +12656,102 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -10105,38 +12760,30 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="id" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10145,32 +12792,39 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" key="address" gi="address">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
-         </xsl:if>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
          <xsl:for-each-group select="addr-line" group-by="true()">
             <group in-json="ARRAY" key="addr-lines">
@@ -10185,30 +12839,30 @@
          <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -10217,16 +12871,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -10235,16 +12889,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -10253,16 +12907,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -10271,58 +12925,142 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/system-name"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="system-name"
+              key="system-name"
+              gi="system-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">system-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-name-short"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
-         <value as-type="uri" in-json="string">
+              as-type="string"
+              name="system-name-short"
+              key="system-name-short"
+              gi="system-name-short"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">system-name-short</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/description"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10331,66 +13069,173 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/date-authorized"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
+         <value as-type="date" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/security-sensitivity-level"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-sensitivity-level"
+              key="security-sensitivity-level"
+              gi="security-sensitivity-level"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">security-sensitivity-level</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="information-type" gi="information-type">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="categorization" group-by="true()">
+            <group in-json="ARRAY" key="categorizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="confidentiality-impact"/>
+         <xsl:apply-templates select="integrity-impact"/>
+         <xsl:apply-templates select="availability-impact"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="categorization" gi="categorization">
+         <xsl:apply-templates select="@system"/>
+         <xsl:for-each-group select="information-type-id" group-by="true()">
+            <group in-json="ARRAY" key="information-type-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="id" in-json="string">
+              as-type="string"
+              name="information-type-id"
+              gi="information-type-id"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10399,163 +13244,168 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">selected</xsl:attribute>
+         </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
-         <value as-type="uuid" in-json="string">
-            <xsl:value-of select="."/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10564,249 +13414,260 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-name"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-name"
-             key="system-name"
-             gi="system-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">system-name</xsl:attribute>
+            <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-name-short"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-name-short"
-             key="system-name-short"
-             gi="system-name-short"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">system-name-short</xsl:attribute>
+            <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/description"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-confidentiality"
+              key="security-objective-confidentiality"
+              gi="security-objective-confidentiality"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">security-objective-confidentiality</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/date-authorized"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-integrity"
+              key="security-objective-integrity"
+              gi="security-objective-integrity"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">date-authorized</xsl:attribute>
+            <xsl:attribute name="key">security-objective-integrity</xsl:attribute>
          </xsl:if>
-         <value as-type="date" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/security-sensitivity-level"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-sensitivity-level"
-             key="security-sensitivity-level"
-             gi="security-sensitivity-level"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-availability"
+              key="security-objective-availability"
+              gi="security-objective-availability"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-sensitivity-level</xsl:attribute>
+            <xsl:attribute name="key">security-objective-availability</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/status"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="information-type" gi="information-type">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="categorization" group-by="true()">
-            <group in-json="ARRAY" key="categorizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="confidentiality-impact"/>
-         <xsl:apply-templates select="integrity-impact"/>
-         <xsl:apply-templates select="availability-impact"/>
-      </assembly>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="categorization" gi="categorization">
-         <xsl:apply-templates select="@system"/>
-         <xsl:for-each-group select="information-type-id" group-by="true()">
-            <group in-json="ARRAY" key="information-type-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="information-type-id"
-             gi="information-type-id"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">caption</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/network-architecture/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/network-architecture/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10815,45 +13676,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="confidentiality-impact"
-                key="confidentiality-impact"
-                gi="confidentiality-impact">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="base"/>
-         <xsl:apply-templates select="selected"/>
-         <xsl:apply-templates select="adjustment-justification"/>
-      </assembly>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10862,103 +13716,96 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/caption"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base</xsl:attribute>
+            <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/data-flow/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-characteristics/data-flow/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">selected</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="integrity-impact"
-                key="integrity-impact"
-                gi="integrity-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">integrity-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="base"/>
-         <xsl:apply-templates select="selected"/>
-         <xsl:apply-templates select="adjustment-justification"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -10967,74 +13814,67 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/caption"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base</xsl:attribute>
+            <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-characteristics/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">selected</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="availability-impact"
-                key="availability-impact"
-                gi="availability-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">availability-impact</xsl:attribute>
-         </xsl:if>
+      <assembly name="leveraged-authorization" gi="leveraged-authorization">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -11049,225 +13889,151 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="base"/>
-         <xsl:apply-templates select="selected"/>
-         <xsl:apply-templates select="adjustment-justification"/>
+         <xsl:apply-templates select="party-uuid"/>
+         <xsl:apply-templates select="date-authorized"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/party-uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              key="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">selected</xsl:attribute>
+            <xsl:attribute name="key">party-uuid</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
+         <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/date-authorized"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-confidentiality"
-             key="security-objective-confidentiality"
-             gi="security-objective-confidentiality"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-objective-confidentiality</xsl:attribute>
+            <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
+         <value as-type="date" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/user/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-integrity"
-             key="security-objective-integrity"
-             gi="security-objective-integrity"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-objective-integrity</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/user/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-availability"
-             key="security-objective-availability"
-             gi="security-objective-availability"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-objective-availability</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/status"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/user/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/user/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11276,194 +14042,202 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/user/authorized-privilege/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">caption</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/network-architecture/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/user/authorized-privilege/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/network-architecture/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/purpose"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/caption"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">caption</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/data-flow/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/status"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-implementation/component/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/data-flow/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/component/protocol/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/inventory-item/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/inventory-item/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11472,34 +14246,64 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/caption"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">caption</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="@component-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11508,16 +14312,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11526,60 +14330,131 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation"
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="leveraged-authorization" gi="leveraged-authorization">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
+      <assembly name="control-implementation"
+                 key="control-implementation"
+                 gi="control-implementation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">control-implementation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="set-parameter" group-by="true()">
+            <group in-json="ARRAY" key="set-parameters">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="implemented-requirement" group-by="true()">
+            <group in-json="ARRAY" key="implemented-requirements">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="party-uuid"/>
-         <xsl:apply-templates select="date-authorized"/>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/description"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/set-parameter/value"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="implemented-requirement" gi="implemented-requirement">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="set-parameter" group-by="true()">
+            <group in-json="ARRAY" key="set-parameters">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="statement" group-by="true()">
+            <group in-json="ARRAY" key="statements">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="by-component" group-by="true()">
+            <group in-json="ARRAY" key="by-components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11588,110 +14463,144 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/party-uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             key="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">party-uuid</xsl:attribute>
-         </xsl:if>
-         <value as-type="uuid" in-json="string">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/date-authorized"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">date-authorized</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="date" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/user/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="statement" gi="statement">
+         <xsl:apply-templates select="@statement-id"/>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="by-component" group-by="true()">
+            <group in-json="ARRAY" key="by-components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/user/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/user/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/user/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11700,114 +14609,181 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/user/authorized-privilege/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/user/authorized-privilege/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="export" key="export" gi="export">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">export</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="provided" group-by="true()">
+            <group in-json="ARRAY" key="provided">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsibility" group-by="true()">
+            <group in-json="ARRAY" key="responsibilities">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="provided" gi="provided">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11816,28 +14792,70 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
+      <assembly name="responsibility" gi="responsibility">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@provided-uuid"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11846,56 +14864,87 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/inventory-item/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="inherited" gi="inherited">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@provided-uuid"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/inventory-item/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11904,16 +14953,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11922,12 +14971,14 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="@component-uuid"/>
+      <assembly name="satisfied" gi="satisfied">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@responsibility-uuid"/>
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -11942,8 +14993,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -11952,34 +15003,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -11988,76 +15043,105 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-implementation"
-                key="control-implementation"
-                gi="control-implementation">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">control-implementation</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="set-parameter" group-by="true()">
-            <group in-json="ARRAY" key="set-parameters">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="implemented-requirement" group-by="true()">
-            <group in-json="ARRAY" key="implemented-requirements">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/description"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/set-parameter/value"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="implemented-requirement" gi="implemented-requirement">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@control-id"/>
+      <assembly name="export" key="export" gi="export">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">export</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -12072,29 +15156,15 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="set-parameter" group-by="true()">
-            <group in-json="ARRAY" key="set-parameters">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="statement" group-by="true()">
-            <group in-json="ARRAY" key="statements">
+         <xsl:for-each-group select="provided" group-by="true()">
+            <group in-json="ARRAY" key="provided">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="by-component" group-by="true()">
-            <group in-json="ARRAY" key="by-components">
+         <xsl:for-each-group select="responsibility" group-by="true()">
+            <group in-json="ARRAY" key="responsibilities">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -12103,48 +15173,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12153,13 +15213,13 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="statement" gi="statement">
-         <xsl:apply-templates select="@statement-id"/>
+      <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -12181,84 +15241,41 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="by-component" group-by="true()">
-            <group in-json="ARRAY" key="by-components">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12267,28 +15284,31 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="export" key="export" gi="export">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">export</xsl:attribute>
-         </xsl:if>
+      <assembly name="responsibility" gi="responsibility">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -12304,15 +15324,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="provided" group-by="true()">
-            <group in-json="ARRAY" key="provided">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsibility" group-by="true()">
-            <group in-json="ARRAY" key="responsibilities">
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -12321,38 +15334,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12361,12 +15374,31 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="provided" gi="provided">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@provided-uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -12389,41 +15421,40 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12432,16 +15463,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12450,13 +15481,13 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsibility" gi="responsibility">
+      <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@provided-uuid"/>
+         <xsl:apply-templates select="@responsibility-uuid"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -12482,38 +15513,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12522,16 +15553,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12540,13 +15571,31 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="inherited" gi="inherited">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/back-matter/resource"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@provided-uuid"/>
+         <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -12555,88 +15604,88 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
+         <xsl:apply-templates select="citation"/>
+         <xsl:for-each-group select="rlink" group-by="true()">
+            <group in-json="ARRAY" key="rlinks">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="base64"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/back-matter/resource/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/back-matter/resource/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/back-matter/resource/document-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/back-matter/resource/citation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="satisfied" gi="satisfied">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@responsibility-uuid"/>
-         <xsl:apply-templates select="description"/>
+         <xsl:apply-templates select="text"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -12651,48 +15700,36 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/back-matter/resource/citation/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/back-matter/resource/citation/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12701,105 +15738,141 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/back-matter/resource/rlink"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="@media-type"/>
+         <xsl:for-each-group select="hash" group-by="true()">
+            <group in-json="ARRAY" key="hashes">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="system-security-plan/back-matter/resource/base64"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <xsl:apply-templates select="@filename"/>
+         <xsl:apply-templates select="@media-type"/>
+         <value as-type="base64Binary" key="value" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="export" key="export" gi="export">
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">export</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="description"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -12814,126 +15887,124 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="provided" group-by="true()">
-            <group in-json="ARRAY" key="provided">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsibility" group-by="true()">
-            <group in-json="ARRAY" key="responsibilities">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+         <xsl:apply-templates select="revision"/>
+      </group>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="provided" gi="provided">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12942,16 +16013,30 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -12960,13 +16045,14 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsibility" gi="responsibility">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@provided-uuid"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -12982,155 +16068,77 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="inherited" gi="inherited">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@provided-uuid"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -13139,30 +16147,44 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="satisfied" gi="satisfied">
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@responsibility-uuid"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -13171,179 +16193,209 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="resource" gi="resource">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="document-id" group-by="true()">
-            <group in-json="ARRAY" key="document-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="citation"/>
-         <xsl:for-each-group select="rlink" group-by="true()">
-            <group in-json="ARRAY" key="rlinks">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="base64"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="citation" key="citation" gi="citation">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="text"/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -13358,311 +16410,269 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="@href"/>
-         <xsl:apply-templates select="@media-type"/>
-         <xsl:for-each-group select="hash" group-by="true()">
-            <group in-json="ARRAY" key="hashes">
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="system-security-plan/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@filename"/>
-         <xsl:apply-templates select="@media-type"/>
-         <value as-type="base64Binary" key="value" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="published"/>
-         <xsl:apply-templates select="last-modified"/>
-         <xsl:apply-templates select="version"/>
-         <xsl:apply-templates select="oscal-version"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="revision"/>
-      </group>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -13671,30 +16681,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -13703,260 +16699,312 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions"
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="local-definitions"
+                 key="local-definitions"
+                 gi="local-definitions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">local-definitions</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="component" group-by="true()">
+            <group in-json="ARRAY" key="components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="inventory-item" group-by="true()">
+            <group in-json="ARRAY" key="inventory-items">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="user" group-by="true()">
+            <group in-json="ARRAY" key="users">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="objectives-and-methods" group-by="true()">
+            <group in-json="ARRAY" key="objectives-and-methods">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="activity" group-by="true()">
+            <group in-json="ARRAY" key="activities">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/component/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/component/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/component/purpose"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/component/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/component/status"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" key="address" gi="address">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
+            <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/component/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/component/protocol/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/inventory-item/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/inventory-item/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="@component-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
-         <value as-type="uri" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -13965,34 +17013,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/user/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/user/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -14001,30 +17049,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/user/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="id" in-json="string">
-            <xsl:value-of select="."/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/user/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14032,164 +17088,173 @@
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/user/authorized-privilege/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/user/authorized-privilege/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
-      </assembly>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
-         <value as-type="uuid" in-json="string">
-            <xsl:value-of select="."/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14198,46 +17263,31 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">local-definitions</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="component" group-by="true()">
-            <group in-json="ARRAY" key="components">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="inventory-item" group-by="true()">
-            <group in-json="ARRAY" key="inventory-items">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="user" group-by="true()">
-            <group in-json="ARRAY" key="users">
+      <assembly name="step" gi="step">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="objectives-and-methods" group-by="true()">
-            <group in-json="ARRAY" key="objectives-and-methods">
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="activity" group-by="true()">
-            <group in-json="ARRAY" key="activities">
+         <xsl:apply-templates select="reviewed-controls"/>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -14246,16 +17296,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -14264,56 +17314,78 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14322,118 +17394,148 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-control" group-by="true()">
+            <group in-json="ARRAY" key="include-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-control" group-by="true()">
+            <group in-json="ARRAY" key="exclude-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/inventory-item/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/inventory-item/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="@component-uuid"/>
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -14448,8 +17550,16 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-objective" group-by="true()">
+            <group in-json="ARRAY" key="include-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-objective" group-by="true()">
+            <group in-json="ARRAY" key="exclude-objectives">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -14458,34 +17568,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14494,74 +17608,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/user/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/step/responsible-role/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/user/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/user/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/user/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14570,78 +17666,76 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/user/authorized-privilege/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/user/authorized-privilege/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-control" group-by="true()">
+            <group in-json="ARRAY" key="include-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-control" group-by="true()">
+            <group in-json="ARRAY" key="exclude-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14650,92 +17744,152 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/objectives-and-methods//part/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-objective" group-by="true()">
+            <group in-json="ARRAY" key="include-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-objective" group-by="true()">
+            <group in-json="ARRAY" key="exclude-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/local-definitions/activity/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14744,49 +17898,35 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/terms-and-conditions"
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="step" gi="step">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="reviewed-controls"/>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
+      <assembly name="terms-and-conditions"
+                 key="terms-and-conditions"
+                 gi="terms-and-conditions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="part" group-by="true()">
+            <group in-json="ARRAY" key="parts">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/terms-and-conditions//part/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -14795,38 +17935,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/terms-and-conditions//part/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14835,38 +17953,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/description"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14875,9 +17993,9 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-selection" gi="control-selection">
          <xsl:apply-templates select="description"/>
@@ -14913,38 +18031,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -14953,9 +18071,9 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection/include-control"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-control">
          <xsl:apply-templates select="@control-id"/>
@@ -14968,23 +18086,23 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection/exclude-control"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-control">
          <xsl:apply-templates select="@control-id"/>
@@ -14997,23 +18115,23 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-objective-selection" gi="control-objective-selection">
          <xsl:apply-templates select="description"/>
@@ -15049,38 +18167,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15089,16 +18207,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/step/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-subject/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-subject/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15107,38 +18247,110 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-subject/include-subject/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-subject/exclude-subject/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/component/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/component/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-assets/component/purpose"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">purpose</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/component/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15147,12 +18359,127 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-assets/component/status"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/component/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/component/protocol/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="uses-component" group-by="true()">
+            <group in-json="ARRAY" key="uses-components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="description"/>
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -15167,16 +18494,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-control" group-by="true()">
-            <group in-json="ARRAY" key="include-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-control" group-by="true()">
-            <group in-json="ARRAY" key="exclude-controls">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -15185,38 +18504,92 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan//task/title"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan//task/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15225,70 +18598,75 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/timing"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+      <assembly name="timing" key="timing" gi="timing">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">timing</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="on-date"/>
+         <xsl:apply-templates select="within-date-range"/>
+         <xsl:apply-templates select="at-frequency"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/timing/on-date"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@date"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/timing/within-date-range"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@start"/>
+         <xsl:apply-templates select="@end"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/timing/at-frequency"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@period"/>
+         <xsl:apply-templates select="@unit"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/dependency"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="description"/>
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="@task-uuid"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-plan//task/associated-activity"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -15303,16 +18681,15 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-objective" group-by="true()">
-            <group in-json="ARRAY" key="include-objectives">
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-objective" group-by="true()">
-            <group in-json="ARRAY" key="exclude-objectives">
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -15321,38 +18698,74 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/associated-activity/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan//task/associated-activity/responsible-role/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan//task/associated-activity/subject/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/associated-activity/subject/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15361,16 +18774,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/local-definitions/activity/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/associated-activity/subject/include-subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15379,53 +18792,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/terms-and-conditions"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="terms-and-conditions"
-                key="terms-and-conditions"
-                gi="terms-and-conditions">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:for-each-group select="part" group-by="true()">
-            <group in-json="ARRAY" key="parts">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/terms-and-conditions//part/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/subject/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan//task/subject/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/terms-and-conditions//part/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/subject/include-subject/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15434,38 +18868,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/description"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/subject/exclude-subject/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan//task/responsible-role/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15474,11 +18904,13 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-selection" gi="control-selection">
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -15487,108 +18919,97 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-control" group-by="true()">
-            <group in-json="ARRAY" key="include-controls">
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-control" group-by="true()">
-            <group in-json="ARRAY" key="exclude-controls">
+         <xsl:apply-templates select="citation"/>
+         <xsl:for-each-group select="rlink" group-by="true()">
+            <group in-json="ARRAY" key="rlinks">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="base64"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/back-matter/resource/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource/document-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection/include-control"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource/citation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="text"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection/exclude-control"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -15596,184 +19017,219 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource/citation/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource/citation/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-objective" group-by="true()">
-            <group in-json="ARRAY" key="include-objectives">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-objective" group-by="true()">
-            <group in-json="ARRAY" key="exclude-objectives">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-plan/back-matter/resource/rlink"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="@media-type"/>
+         <xsl:for-each-group select="hash" group-by="true()">
+            <group in-json="ARRAY" key="hashes">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-plan/back-matter/resource/base64"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <xsl:apply-templates select="@filename"/>
+         <xsl:apply-templates select="@media-type"/>
+         <value as-type="base64Binary" key="value" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/reviewed-controls/control-objective-selection/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-subject/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-subject/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-subject/include-subject/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-subject/exclude-subject/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="revision"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -15782,86 +19238,88 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@state"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15870,31 +19328,47 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="assessment-platform" gi="assessment-platform">
-         <xsl:apply-templates select="@uuid"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
          <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -15909,26 +19383,19 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="uses-component" group-by="true()">
-            <group in-json="ARRAY" key="uses-components">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -15937,16 +19404,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -15955,28 +19462,44 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="uses-component" gi="uses-component">
-         <xsl:apply-templates select="@component-uuid"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -15985,169 +19508,209 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/timing"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="timing" key="timing" gi="timing">
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="on-date"/>
-         <xsl:apply-templates select="within-date-range"/>
-         <xsl:apply-templates select="at-frequency"/>
-      </assembly>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/timing/on-date"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@date"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/timing/within-date-range"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@start"/>
-         <xsl:apply-templates select="@end"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/timing/at-frequency"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@period"/>
-         <xsl:apply-templates select="@unit"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <value as-type="uri" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/dependency"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="@task-uuid"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="@activity-uuid"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -16162,15 +19725,36 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -16179,74 +19763,66 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity/responsible-role/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity/subject/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="id" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity/subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16255,92 +19831,163 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity/subject/include-subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/subject/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/subject/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/subject/include-subject/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16349,16 +19996,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/subject/exclude-subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16367,16 +20014,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan//task/responsible-role/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16385,147 +20032,159 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions"
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="resource" gi="resource">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="document-id" group-by="true()">
-            <group in-json="ARRAY" key="document-ids">
+      <assembly name="local-definitions"
+                 key="local-definitions"
+                 gi="local-definitions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">local-definitions</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="objectives-and-methods" group-by="true()">
+            <group in-json="ARRAY" key="objectives-and-methods">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="citation"/>
-         <xsl:for-each-group select="rlink" group-by="true()">
-            <group in-json="ARRAY" key="rlinks">
+         <xsl:for-each-group select="activity" group-by="true()">
+            <group in-json="ARRAY" key="activities">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="base64"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/objectives-and-methods/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/objectives-and-methods/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="citation" key="citation" gi="citation">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="text"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/local-definitions/activity/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16534,51 +20193,49 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="@href"/>
-         <xsl:apply-templates select="@media-type"/>
-         <xsl:for-each-group select="hash" group-by="true()">
-            <group in-json="ARRAY" key="hashes">
+      <assembly name="step" gi="step">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="reviewed-controls"/>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-plan/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@filename"/>
-         <xsl:apply-templates select="@media-type"/>
-         <value as-type="base64Binary" key="value" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -16587,88 +20244,92 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="published"/>
-         <xsl:apply-templates select="last-modified"/>
-         <xsl:apply-templates select="version"/>
-         <xsl:apply-templates select="oscal-version"/>
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -16683,124 +20344,192 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-control" group-by="true()">
+            <group in-json="ARRAY" key="include-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-control" group-by="true()">
+            <group in-json="ARRAY" key="exclude-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="revision"/>
-      </group>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-objective" group-by="true()">
+            <group in-json="ARRAY" key="include-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-objective" group-by="true()">
+            <group in-json="ARRAY" key="exclude-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16809,30 +20538,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/step/responsible-role/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16841,74 +20556,116 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-control" group-by="true()">
+            <group in-json="ARRAY" key="include-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-control" group-by="true()">
+            <group in-json="ARRAY" key="exclude-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -16917,184 +20674,152 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" key="address" gi="address">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-objective" group-by="true()">
+            <group in-json="ARRAY" key="include-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-objective" group-by="true()">
+            <group in-json="ARRAY" key="exclude-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
-         <value as-type="uri" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   </xsl:template>
+   <xsl:template match="assessment-results/local-definitions/activity/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17103,231 +20828,239 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/title"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/start"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="id" in-json="string">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">start</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/end"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
+         <value as-type="dateTime-with-timezone" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
+      <assembly name="local-definitions"
+                 key="local-definitions"
+                 gi="local-definitions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">local-definitions</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="component" group-by="true()">
+            <group in-json="ARRAY" key="components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="inventory-item" group-by="true()">
+            <group in-json="ARRAY" key="inventory-items">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="user" group-by="true()">
+            <group in-json="ARRAY" key="users">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="assessment-assets"/>
+         <xsl:for-each-group select="assessment-task" group-by="true()">
+            <group in-json="ARRAY" key="tasks">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/purpose"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/status"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
-         <value as-type="uuid" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/responsible-role/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17336,65 +21069,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/component/protocol/title"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">local-definitions</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <xsl:for-each-group select="objectives-and-methods" group-by="true()">
-            <group in-json="ARRAY" key="objectives-and-methods">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="activity" group-by="true()">
-            <group in-json="ARRAY" key="activities">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/objectives-and-methods/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/inventory-item/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/objectives-and-methods/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/inventory-item/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17403,34 +21127,82 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="@component-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/objectives-and-methods//part/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17439,16 +21211,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/user/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -17457,38 +21229,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/user/short-name"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions/user/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/user/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17497,49 +21287,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="step" gi="step">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="reviewed-controls"/>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/user/authorized-privilege/title"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -17548,156 +21305,96 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/user/authorized-privilege/description"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/purpose"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-control" group-by="true()">
-            <group in-json="ARRAY" key="include-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-control" group-by="true()">
-            <group in-json="ARRAY" key="exclude-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17706,70 +21403,61 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/status"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="description"/>
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -17784,16 +21472,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-objective" group-by="true()">
-            <group in-json="ARRAY" key="include-objectives">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-objective" group-by="true()">
-            <group in-json="ARRAY" key="exclude-objectives">
+         <xsl:for-each-group select="uses-component" group-by="true()">
+            <group in-json="ARRAY" key="uses-components">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -17802,96 +21482,34 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/step/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17900,12 +21518,12 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="description"/>
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="@component-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -17920,16 +21538,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-control" group-by="true()">
-            <group in-json="ARRAY" key="include-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-control" group-by="true()">
-            <group in-json="ARRAY" key="exclude-controls">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -17938,38 +21548,92 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -17978,70 +21642,75 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+      <assembly name="timing" key="timing" gi="timing">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">timing</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="on-date"/>
+         <xsl:apply-templates select="within-date-range"/>
+         <xsl:apply-templates select="at-frequency"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/on-date"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@date"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@start"/>
+         <xsl:apply-templates select="@end"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@period"/>
+         <xsl:apply-templates select="@unit"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/dependency"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="description"/>
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="@task-uuid"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="@activity-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -18056,16 +21725,15 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-objective" group-by="true()">
-            <group in-json="ARRAY" key="include-objectives">
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-objective" group-by="true()">
-            <group in-json="ARRAY" key="exclude-objectives">
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -18074,38 +21742,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18114,16 +21760,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/local-definitions/activity/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18132,92 +21778,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/start"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/end"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18226,115 +21836,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">local-definitions</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="component" group-by="true()">
-            <group in-json="ARRAY" key="components">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="inventory-item" group-by="true()">
-            <group in-json="ARRAY" key="inventory-items">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="user" group-by="true()">
-            <group in-json="ARRAY" key="users">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="assessment-assets"/>
-         <xsl:for-each-group select="assessment-task" group-by="true()">
-            <group in-json="ARRAY" key="tasks">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/description"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/purpose"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18343,28 +21912,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/status"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18373,74 +21930,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/component/protocol/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/inventory-item/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/inventory-item/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18449,12 +21988,12 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="@component-uuid"/>
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -18469,8 +22008,16 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-control" group-by="true()">
+            <group in-json="ARRAY" key="include-controls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-control" group-by="true()">
+            <group in-json="ARRAY" key="exclude-controls">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -18479,34 +22026,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18515,220 +22066,209 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/user/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/include-control"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/user/short-name"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/user/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/exclude-control"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="statement-id" group-by="true()">
+            <group in-json="ARRAY" key="statement-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/user/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/user/authorized-privilege/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="include-all"/>
+         <xsl:for-each-group select="include-objective" group-by="true()">
+            <group in-json="ARRAY" key="include-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="exclude-objective" group-by="true()">
+            <group in-json="ARRAY" key="exclude-objectives">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/user/authorized-privilege/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/attestation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+      <assembly name="attestation" gi="attestation">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="part" group-by="true()">
+            <group in-json="ARRAY" key="parts">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/purpose"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/attestation/responsible-party/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/attestation//part/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/status"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/attestation//part/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18737,31 +22277,33 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">assessment-log</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:for-each-group select="entry" group-by="true()">
+            <group in-json="ARRAY" key="entries">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="assessment-platform" gi="assessment-platform">
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:apply-templates select="start"/>
+         <xsl:apply-templates select="end"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -18776,8 +22318,15 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="uses-component" group-by="true()">
-            <group in-json="ARRAY" key="uses-components">
+         <xsl:for-each-group select="logged-by" group-by="true()">
+            <group in-json="ARRAY" key="logged-by">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="related-task" group-by="true()">
+            <group in-json="ARRAY" key="related-tasks">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -18786,16 +22335,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -18804,64 +22353,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/assessment-log/entry/start"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/end"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="uses-component" gi="uses-component">
-         <xsl:apply-templates select="@component-uuid"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">end</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18870,16 +22429,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18888,56 +22447,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -18946,96 +22505,53 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="on-date"/>
-         <xsl:apply-templates select="within-date-range"/>
-         <xsl:apply-templates select="at-frequency"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/on-date"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@date"/>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@start"/>
-         <xsl:apply-templates select="@end"/>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@period"/>
-         <xsl:apply-templates select="@unit"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/dependency"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="@task-uuid"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="@activity-uuid"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -19043,37 +22559,40 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19082,38 +22601,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19122,16 +22619,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19140,56 +22637,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19198,16 +22695,44 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/method"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/type"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/origin/actor/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19216,16 +22741,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19234,16 +22759,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/responsible-party/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19252,38 +22777,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19292,76 +22817,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-control" group-by="true()">
-            <group in-json="ARRAY" key="include-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-control" group-by="true()">
-            <group in-json="ARRAY" key="exclude-controls">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19370,134 +22853,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/include-control"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/exclude-control"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="statement-id" group-by="true()">
-            <group in-json="ARRAY" key="statement-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="include-all"/>
-         <xsl:for-each-group select="include-objective" group-by="true()">
-            <group in-json="ARRAY" key="include-objectives">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="exclude-objective" group-by="true()">
-            <group in-json="ARRAY" key="exclude-objectives">
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/reviewed-controls/control-objective-selection/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19506,37 +22913,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/attestation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="attestation" gi="attestation">
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="part" group-by="true()">
-            <group in-json="ARRAY" key="parts">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/attestation/responsible-party/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19545,34 +22931,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/attestation//part/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/attestation//part/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19581,33 +22949,14 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">assessment-log</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="entry" group-by="true()">
-            <group in-json="ARRAY" key="entries">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/subject"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="entry" gi="entry">
-         <xsl:apply-templates select="@uuid"/>
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="@subject-uuid"/>
+         <xsl:apply-templates select="@type"/>
          <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:apply-templates select="start"/>
-         <xsl:apply-templates select="end"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -19622,15 +22971,61 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="logged-by" group-by="true()">
-            <group in-json="ARRAY" key="logged-by">
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/subject/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/subject/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/relevant-evidence"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="relevant-evidence" gi="relevant-evidence">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="related-task" group-by="true()">
-            <group in-json="ARRAY" key="related-tasks">
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -19639,16 +23034,92 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/observation/relevant-evidence/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/relevant-evidence/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/collected"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">collected</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/observation/expires"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">expires</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -19657,74 +23128,78 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/start"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/statement"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
+            <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/end"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/actor/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19733,16 +23208,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19751,16 +23226,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/responsible-party/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19769,38 +23244,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19809,16 +23284,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19827,16 +23302,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19845,13 +23320,13 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -19865,38 +23340,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19905,16 +23380,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19923,16 +23398,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19941,56 +23416,52 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/actor/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -19999,44 +23470,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/method"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/description"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20045,16 +23528,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20063,16 +23546,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20081,38 +23564,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20121,16 +23624,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20139,16 +23642,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20157,17 +23660,71 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/characterization/facet"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <assembly name="facet" gi="facet">
+         <xsl:apply-templates select="@name"/>
+         <xsl:apply-templates select="@system"/>
+         <xsl:apply-templates select="@value"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/characterization/facet/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/mitigating-factor"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mitigating-factor" gi="mitigating-factor">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@implementation-uuid"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -20177,74 +23734,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/mitigating-factor/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/mitigating-factor/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20253,9 +23774,9 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/subject"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/mitigating-factor/subject"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -20278,16 +23799,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/subject/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/mitigating-factor/subject/title"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -20296,16 +23817,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/mitigating-factor/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20314,12 +23835,32 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/relevant-evidence"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/deadline"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="relevant-evidence" gi="relevant-evidence">
-         <xsl:apply-templates select="@href"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">deadline</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/response"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="response" gi="response">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@lifecycle"/>
+         <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
@@ -20335,41 +23876,80 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="origin" group-by="true()">
+            <group in-json="ARRAY" key="origins">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="required-asset" group-by="true()">
+            <group in-json="ARRAY" key="required-assets">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="task" group-by="true()">
+            <group in-json="ARRAY" key="tasks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/relevant-evidence/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/response/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/relevant-evidence/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20378,114 +23958,92 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/collected"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/actor/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">collected</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/observation/expires"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">expires</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/description"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/statement"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">statement</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20494,16 +24052,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text"
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20512,16 +24070,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20530,56 +24088,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20588,16 +24148,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="21"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20606,16 +24166,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20624,17 +24184,12 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+      <assembly name="required-asset" gi="required-asset">
+         <xsl:apply-templates select="@uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -20642,76 +24197,78 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset/subject"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="@subject-uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset/subject/title"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20720,52 +24277,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset/title"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/actor/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response/required-asset/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20774,56 +24335,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/title"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20832,53 +24393,96 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/timing"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:apply-templates select="on-date"/>
+         <xsl:apply-templates select="within-date-range"/>
+         <xsl:apply-templates select="at-frequency"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/timing/on-date"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">on-date</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:apply-templates select="@date"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/timing/within-date-range"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:apply-templates select="@start"/>
+         <xsl:apply-templates select="@end"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/response//task/timing/at-frequency"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@period"/>
+         <xsl:apply-templates select="@unit"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/response//task/dependency"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="@task-uuid"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="@activity-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -20886,40 +24490,37 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20928,16 +24529,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/description"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20946,16 +24569,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text"
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -20964,41 +24587,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/facet"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="facet" gi="facet">
-         <xsl:apply-templates select="@name"/>
-         <xsl:apply-templates select="@system"/>
-         <xsl:apply-templates select="@value"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/characterization/facet/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21007,130 +24605,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/mitigating-factor"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="mitigating-factor" gi="mitigating-factor">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@implementation-uuid"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/mitigating-factor/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/mitigating-factor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/mitigating-factor/subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="@subject-uuid"/>
-         <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/mitigating-factor/subject/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/mitigating-factor/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21139,33 +24681,51 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/deadline"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/response//task/responsible-role/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">deadline</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="response" gi="response">
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">risk-log</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="entry" group-by="true()">
+            <group in-json="ARRAY" key="entries">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/risk/risk-log/entry"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@lifecycle"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
+         <xsl:apply-templates select="start"/>
+         <xsl:apply-templates select="end"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -21180,22 +24740,16 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="origin" group-by="true()">
-            <group in-json="ARRAY" key="origins">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="required-asset" group-by="true()">
-            <group in-json="ARRAY" key="required-assets">
+         <xsl:for-each-group select="logged-by" group-by="true()">
+            <group in-json="ARRAY" key="logged-by">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="task" group-by="true()">
-            <group in-json="ARRAY" key="tasks">
+         <xsl:apply-templates select="status-change"/>
+         <xsl:for-each-group select="related-response" group-by="true()">
+            <group in-json="ARRAY" key="related-responses">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -21204,16 +24758,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/title"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -21222,92 +24776,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/description"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/actor/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/start"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/end"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21316,38 +24852,46 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+      <assembly name="related-response" gi="related-response">
+         <xsl:apply-templates select="@response-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="related-task" group-by="true()">
+            <group in-json="ARRAY" key="related-tasks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21356,16 +24900,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21374,16 +24918,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21392,58 +24936,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21452,16 +24976,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="21"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text"
+                  priority="21"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21470,16 +24994,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21488,12 +25012,17 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="required-asset" gi="required-asset">
-         <xsl:apply-templates select="@uuid"/>
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -21501,78 +25030,40 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset/subject"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="@subject-uuid"/>
-         <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset/subject/title"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21581,56 +25072,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="22"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response/required-asset/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="21"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21639,16 +25108,24 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/risk/related-observation"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="@observation-uuid"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/finding/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -21657,38 +25134,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21697,116 +25174,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/timing"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="on-date"/>
-         <xsl:apply-templates select="within-date-range"/>
-         <xsl:apply-templates select="at-frequency"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/timing/on-date"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@date"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/timing/within-date-range"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@start"/>
-         <xsl:apply-templates select="@end"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/timing/at-frequency"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/actor/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@period"/>
-         <xsl:apply-templates select="@unit"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/dependency"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="@task-uuid"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="@activity-uuid"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21815,16 +25210,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/responsible-party/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21833,38 +25228,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21873,16 +25268,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21891,16 +25286,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21909,38 +25304,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21949,16 +25364,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21967,16 +25382,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -21985,16 +25400,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/response//task/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/target/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/finding/target/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/finding/target/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22003,33 +25458,61 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/target/status"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="risk-log" key="risk-log" gi="risk-log">
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">risk-log</xsl:attribute>
+            <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-         <xsl:for-each-group select="entry" group-by="true()">
-            <group in-json="ARRAY" key="entries">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="@reason"/>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/result/finding/implementation-statement-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="entry" gi="entry">
+      <field collapsible="no"
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+         </xsl:if>
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/finding/related-observation"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="@observation-uuid"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/result/finding/associated-risk"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
+         <xsl:apply-templates select="@risk-uuid"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/back-matter/resource"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
-         <xsl:apply-templates select="start"/>
-         <xsl:apply-templates select="end"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -22037,41 +25520,35 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="logged-by" group-by="true()">
-            <group in-json="ARRAY" key="logged-by">
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="status-change"/>
-         <xsl:for-each-group select="related-response" group-by="true()">
-            <group in-json="ARRAY" key="related-responses">
+         <xsl:apply-templates select="citation"/>
+         <xsl:for-each-group select="rlink" group-by="true()">
+            <group in-json="ARRAY" key="rlinks">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="base64"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -22080,88 +25557,51 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/start"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/end"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/document-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/citation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="related-response" gi="related-response">
-         <xsl:apply-templates select="@response-uuid"/>
+         <xsl:apply-templates select="text"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -22176,26 +25616,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="related-task" group-by="true()">
-            <group in-json="ARRAY" key="related-tasks">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/citation/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22204,16 +25636,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/citation/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22222,254 +25654,273 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="assessment-results/back-matter/resource/rlink"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="@media-type"/>
+         <xsl:for-each-group select="hash" group-by="true()">
+            <group in-json="ARRAY" key="hashes">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="assessment-results/back-matter/resource/base64"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <xsl:apply-templates select="@filename"/>
+         <xsl:apply-templates select="@media-type"/>
+         <value as-type="base64Binary" key="value" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text"
-                 priority="21"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
+         <xsl:apply-templates select="revision"/>
+      </group>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="22"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="21"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/risk/related-observation"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="related-observation" gi="related-observation">
-         <xsl:apply-templates select="@observation-uuid"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/finding/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22478,16 +25929,30 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22496,74 +25961,100 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22572,251 +26063,255 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/target/status"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
-         <xsl:apply-templates select="@reason"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <value as-type="uri" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/implementation-statement-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="implementation-statement-uuid"
-             key="implementation-statement-uuid"
-             gi="implementation-statement-uuid"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="uuid" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/result/finding/related-observation"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="related-observation" gi="related-observation">
-         <xsl:apply-templates select="@observation-uuid"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/result/finding/associated-risk"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
-         <xsl:apply-templates select="@risk-uuid"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="resource" gi="resource">
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -22824,114 +26319,111 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="document-id" group-by="true()">
-            <group in-json="ARRAY" key="document-ids">
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="citation"/>
-         <xsl:for-each-group select="rlink" group-by="true()">
-            <group in-json="ARRAY" key="rlinks">
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="base64"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
+         <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="citation" key="citation" gi="citation">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="text"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -22940,323 +26432,275 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="@href"/>
-         <xsl:apply-templates select="@media-type"/>
-         <xsl:for-each-group select="hash" group-by="true()">
-            <group in-json="ARRAY" key="hashes">
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="assessment-results/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@filename"/>
-         <xsl:apply-templates select="@media-type"/>
-         <value as-type="base64Binary" key="value" in-json="string">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
+         <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="published"/>
-         <xsl:apply-templates select="last-modified"/>
-         <xsl:apply-templates select="version"/>
-         <xsl:apply-templates select="oscal-version"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="revision"/>
-      </group>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/purpose"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="identifier" in-json="string">
-            <xsl:value-of select="."/>
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23265,74 +26709,86 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/status"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/protocol/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23341,184 +26797,188 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" key="address" gi="address">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="@component-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/purpose"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">purpose</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/status"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
-         <value as-type="uri" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/responsible-role/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23527,66 +26987,83 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/protocol/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
-         </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="uses-component" group-by="true()">
+            <group in-json="ARRAY" key="uses-components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="@scheme"/>
-         <value as-type="string" key="id" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23595,163 +27072,168 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <value as-type="email" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="@type"/>
-         <value as-type="string" key="number" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="@type"/>
-         <xsl:for-each-group select="addr-line" group-by="true()">
-            <group in-json="ARRAY" key="addr-lines">
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="@component-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="city"/>
-         <xsl:apply-templates select="state"/>
-         <xsl:apply-templates select="postal-code"/>
-         <xsl:apply-templates select="country"/>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/title"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/method"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
-         <value as-type="uuid" in-json="string">
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/actor/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23760,74 +27242,92 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23836,28 +27336,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@state"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23866,56 +27354,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23924,16 +27414,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23942,12 +27432,32 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="@component-uuid"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/subject"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="@subject-uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="title"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -23962,8 +27472,61 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-party" group-by="true()">
-            <group in-json="ARRAY" key="responsible-parties">
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/subject/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/subject/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="relevant-evidence" gi="relevant-evidence">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -23972,16 +27535,38 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -23990,34 +27575,52 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/collected"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/expires"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">expires</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/title"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -24026,84 +27629,78 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/statement"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/method"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
-         <value as-type="string" in-json="string">
-            <xsl:value-of select="."/>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/type"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/actor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/actor/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24112,16 +27709,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24130,16 +27727,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24148,38 +27745,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24188,16 +27785,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24206,16 +27803,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24224,13 +27821,13 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -24244,38 +27841,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24284,16 +27881,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24302,16 +27899,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24320,59 +27917,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/subject"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="@subject-uuid"/>
-         <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/subject/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/subject/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24381,62 +27953,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="relevant-evidence" gi="relevant-evidence">
-         <xsl:apply-templates select="@href"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24445,114 +27971,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/collected"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">collected</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/expires"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">expires</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/statement"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">statement</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24561,16 +28029,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/actor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24579,16 +28047,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24597,56 +28065,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24655,16 +28125,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24673,16 +28161,41 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="facet" gi="facet">
+         <xsl:apply-templates select="@name"/>
+         <xsl:apply-templates select="@system"/>
+         <xsl:apply-templates select="@value"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24691,17 +28204,28 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+      <assembly name="mitigating-factor" gi="mitigating-factor">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@implementation-uuid"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -24711,38 +28235,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24751,52 +28275,59 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="@subject-uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24805,92 +28336,121 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/deadline"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">deadline</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+      <assembly name="response" gi="response">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@lifecycle"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="origin" group-by="true()">
+            <group in-json="ARRAY" key="origins">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="required-asset" group-by="true()">
+            <group in-json="ARRAY" key="required-assets">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="task" group-by="true()">
+            <group in-json="ARRAY" key="tasks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24899,16 +28459,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/actor/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24917,16 +28477,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -24935,76 +28495,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25013,16 +28553,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25031,71 +28571,35 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="facet" gi="facet">
-         <xsl:apply-templates select="@name"/>
-         <xsl:apply-templates select="@system"/>
-         <xsl:apply-templates select="@value"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="mitigating-factor" gi="mitigating-factor">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@implementation-uuid"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
          <xsl:for-each-group select="subject" group-by="true()">
             <group in-json="ARRAY" key="subjects">
                <xsl:apply-templates select="current-group()">
@@ -25105,38 +28609,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25145,59 +28649,34 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="@subject-uuid"/>
-         <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25206,31 +28685,19 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/deadline"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">deadline</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="response" gi="response">
+      <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="@lifecycle"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
          <xsl:for-each-group select="prop" group-by="true()">
@@ -25247,22 +28714,26 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="origin" group-by="true()">
-            <group in-json="ARRAY" key="origins">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="required-asset" group-by="true()">
-            <group in-json="ARRAY" key="required-assets">
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="@subject-uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="task" group-by="true()">
-            <group in-json="ARRAY" key="tasks">
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -25271,16 +28742,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject/title"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -25289,38 +28760,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25329,16 +28836,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/description"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25347,16 +28894,116 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="timing" key="timing" gi="timing">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">timing</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="on-date"/>
+         <xsl:apply-templates select="within-date-range"/>
+         <xsl:apply-templates select="at-frequency"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/on-date"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@date"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@start"/>
+         <xsl:apply-templates select="@end"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@period"/>
+         <xsl:apply-templates select="@unit"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/dependency"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="@task-uuid"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="@activity-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-role" group-by="true()">
+            <group in-json="ARRAY" key="responsible-roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25365,16 +29012,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25383,38 +29030,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25423,16 +29070,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25440,17 +29087,17 @@
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25459,58 +29106,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@subject-placeholder-uuid"/>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25519,16 +29146,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25537,16 +29164,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25555,21 +29182,51 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="required-asset" gi="required-asset">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">risk-log</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="entry" group-by="true()">
+            <group in-json="ARRAY" key="entries">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="entry" gi="entry">
+         <xsl:apply-templates select="@uuid"/>
          <xsl:apply-templates select="title"/>
          <xsl:apply-templates select="description"/>
+         <xsl:apply-templates select="start"/>
+         <xsl:apply-templates select="end"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -25584,26 +29241,16 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="@subject-uuid"/>
-         <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
+         <xsl:for-each-group select="logged-by" group-by="true()">
+            <group in-json="ARRAY" key="logged-by">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:apply-templates select="status-change"/>
+         <xsl:for-each-group select="related-response" group-by="true()">
+            <group in-json="ARRAY" key="related-responses">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -25612,52 +29259,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/title"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -25666,96 +29277,74 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/description"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/start"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/end"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
-         <value as-type="markup-multiline" in-json="string">
-            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
-               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
-            </xsl:for-each-group>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25764,75 +29353,12 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="on-date"/>
-         <xsl:apply-templates select="within-date-range"/>
-         <xsl:apply-templates select="at-frequency"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/on-date"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@date"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@start"/>
-         <xsl:apply-templates select="@end"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="@period"/>
-         <xsl:apply-templates select="@unit"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/dependency"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="@task-uuid"/>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="@activity-uuid"/>
+      <assembly name="related-response" gi="related-response">
+         <xsl:apply-templates select="@response-uuid"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -25847,15 +29373,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="responsible-role" group-by="true()">
-            <group in-json="ARRAY" key="responsible-roles">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="subject" group-by="true()">
-            <group in-json="ARRAY" key="subjects">
+         <xsl:for-each-group select="related-task" group-by="true()">
+            <group in-json="ARRAY" key="related-tasks">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -25864,16 +29383,16 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25882,16 +29401,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25900,38 +29419,56 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25940,16 +29477,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25958,16 +29495,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -25976,56 +29513,58 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26034,16 +29573,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26052,16 +29591,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26070,75 +29609,24 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="risk-log" key="risk-log" gi="risk-log">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">risk-log</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="entry" group-by="true()">
-            <group in-json="ARRAY" key="entries">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/risk/related-observation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="entry" gi="entry">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:apply-templates select="start"/>
-         <xsl:apply-templates select="end"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="logged-by" group-by="true()">
-            <group in-json="ARRAY" key="logged-by">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="status-change"/>
-         <xsl:for-each-group select="related-response" group-by="true()">
-            <group in-json="ARRAY" key="related-responses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/title"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -26147,74 +29635,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/start"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/end"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
-         </xsl:if>
-         <value as-type="dateTime-with-timezone" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26223,46 +29675,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="related-response" gi="related-response">
-         <xsl:apply-templates select="@response-uuid"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="related-task" group-by="true()">
-            <group in-json="ARRAY" key="related-tasks">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/actor/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26271,16 +29693,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26289,16 +29711,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/responsible-party/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26307,38 +29729,38 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26347,16 +29769,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/include-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26365,16 +29787,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/exclude-subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26383,13 +29805,13 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -26403,38 +29825,38 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26443,16 +29865,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26461,16 +29883,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26479,24 +29901,121 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/risk/related-observation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/target/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/status"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="@reason"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/implementation-statement-uuid"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+         </xsl:if>
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/related-observation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/associated-risk"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
+         <xsl:apply-templates select="@risk-uuid"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -26506,37 +30025,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26546,8 +30065,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/origin"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin" gi="origin">
          <xsl:for-each-group select="actor" group-by="true()">
@@ -26560,15 +30079,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/origin/actor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26577,25 +30096,33 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/poam-item/related-finding"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="related-finding" gi="related-finding">
+         <xsl:apply-templates select="@finding-uuid"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/related-observation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/associated-risk"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -26628,15 +30155,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -26646,35 +30173,35 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -26682,8 +30209,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -26707,15 +30234,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26725,15 +30252,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -26743,8 +30270,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -26759,14 +30286,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -26778,10 +30305,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -26789,43 +30316,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -26843,10 +30370,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -26855,33 +30382,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -26891,24 +30418,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -26916,12 +30443,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -26934,46 +30461,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -26982,18 +30509,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -27001,40 +30528,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -27048,19 +30575,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -27069,24 +30596,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -27096,9 +30623,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -27108,49 +30635,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -27159,9 +30686,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_component_xml-to-json-converter.xsl b/json/convert/oscal_component_xml-to-json-converter.xsl
index 746d6f6c9e..a92c7154ba 100644
--- a/json/convert/oscal_component_xml-to-json-converter.xsl
+++ b/json/convert/oscal_component_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,16 +76,16 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="component-definition metadata revision prop link role location address party responsible-party import-component-definition component responsible-role protocol port-range control-implementation set-parameter implemented-requirement statement capability incorporates-component back-matter resource citation rlink"/>
+   <xsl:strip-space elements="component-definition metadata revision prop link role location address party responsible-party action import-component-definition component responsible-role protocol port-range control-implementation set-parameter implemented-requirement statement capability incorporates-component back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="component-definition"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="component-definition"
-                key="component-definition"
-                gi="component-definition">
+                 key="component-definition"
+                 gi="component-definition">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
          </xsl:if>
@@ -119,7 +119,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -180,11 +180,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -192,67 +199,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -275,21 +243,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -304,65 +265,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -372,16 +276,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-component-definition"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="import-component-definition"
-                gi="import-component-definition">
+                 name="import-component-definition"
+                 gi="import-component-definition">
          <xsl:apply-templates select="@href"/>
       </assembly>
    </xsl:template>
    <xsl:template match="component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="defined-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -428,7 +332,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="responsible-role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
@@ -457,7 +361,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="protocol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
@@ -473,7 +377,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="port-range"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
@@ -482,7 +386,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="set-parameter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
@@ -497,7 +401,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="capability"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="capability" gi="capability">
          <xsl:apply-templates select="@uuid"/>
@@ -535,7 +439,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="incorporates-component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="incorporates-component" gi="incorporates-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -543,7 +447,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -559,54 +463,54 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -616,471 +520,543 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="component-definition/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="component-definition/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="component-definition/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="component-definition/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-component-definition/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="defined-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="defined-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-role/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@start"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@end"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@transport"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="source"
-            key="source"
-            gi="source">
+             as-type="uri-reference"
+             name="source"
+             key="source"
+             gi="source">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="set-parameter/@param-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/@control-id | component-definition/capability/control-implementation/implemented-requirement/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/@statement-id | component-definition/capability/control-implementation/implemented-requirement/statement/@statement-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="capability/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="capability/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="incorporates-component/@component-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component-definition/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1090,15 +1066,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1108,15 +1084,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1126,15 +1102,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1144,15 +1120,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1162,8 +1138,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -1189,14 +1165,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1204,15 +1180,15 @@
       </group>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1222,15 +1198,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1240,15 +1216,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1258,15 +1234,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1276,15 +1252,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1294,15 +1270,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1312,13 +1288,13 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -1326,15 +1302,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1343,16 +1319,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="component-definition/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="component-definition/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1362,15 +1364,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1380,37 +1382,37 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1419,16 +1421,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="component-definition/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="component-definition/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1438,8 +1486,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -1460,29 +1508,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1492,15 +1540,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1510,15 +1558,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1528,15 +1576,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1546,27 +1594,27 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -1574,29 +1622,30 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1605,16 +1654,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="component-definition/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="component-definition/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -1624,15 +1741,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1642,13 +1759,13 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -1656,15 +1773,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1674,27 +1791,27 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -1702,8 +1819,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -1721,29 +1838,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1753,15 +1870,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1771,15 +1888,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1789,15 +1906,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1807,29 +1924,65 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="component-definition/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="component-definition/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1839,15 +1992,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1857,37 +2010,37 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/purpose"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -1897,15 +2050,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1915,15 +2068,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/responsible-role/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1933,15 +2086,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/protocol/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1951,8 +2104,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
@@ -1989,37 +2142,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2029,22 +2182,22 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/set-parameter/value"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
@@ -2089,37 +2242,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2129,29 +2282,29 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2161,8 +2314,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
@@ -2193,37 +2346,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2233,15 +2386,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2251,37 +2404,37 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2291,30 +2444,30 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/incorporates-component/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-implementation" gi="control-implementation">
          <xsl:apply-templates select="@uuid"/>
@@ -2351,37 +2504,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2391,22 +2544,22 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/set-parameter/value"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
@@ -2451,37 +2604,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2491,29 +2644,29 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2523,8 +2676,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
@@ -2555,37 +2708,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2595,15 +2748,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2613,8 +2766,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -2647,15 +2800,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2665,35 +2818,35 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -2701,8 +2854,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -2726,15 +2879,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2744,15 +2897,15 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2762,8 +2915,8 @@
       </field>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -2778,14 +2931,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component-definition/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -2797,10 +2950,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -2808,43 +2961,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -2862,10 +3015,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -2874,33 +3027,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -2910,24 +3063,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -2935,12 +3088,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -2953,46 +3106,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -3001,18 +3154,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -3020,40 +3173,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -3067,19 +3220,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -3088,24 +3241,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -3115,9 +3268,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -3127,49 +3280,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -3178,9 +3331,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_mapping_xml-to-json-converter.xsl b/json/convert/oscal_mapping_xml-to-json-converter.xsl
new file mode 100644
index 0000000000..75fad7d7d6
--- /dev/null
+++ b/json/convert/oscal_mapping_xml-to-json-converter.xsl
@@ -0,0 +1,2526 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+<!-- XML to JSON conversion: pipeline -->
+<!-- Supports either of two interfaces:
+      simply handle the XML as source (easier), producing the JSON as output, or
+      use arguments (equivalent to): -it from-xml produce=json file=[file] (mirrors the JSON converter interface) -->
+<!-- Parameter 'produce' supports acquiring outputs other than JSON:
+      produce=xpath produces XPath JSON (an XML syntax)
+      produce=supermodel produces intermediate (internal) 'supermodel' format-->
+<!-- Parameter setting 'json-indent=yes' produces JSON indented using the internal serializer-->
+   <xsl:param name="file" as="xs:string?"/>
+   <xsl:param name="produce" as="xs:string">json</xsl:param>
+   <xsl:param name="json-indent" as="xs:string">no</xsl:param>
+   <!-- NB the output method is XML but serialized JSON is written with disable-output-escaping (below)
+     permitting inspection of intermediate results without changing the serialization method.-->
+   <xsl:output omit-xml-declaration="true" method="xml"/>
+   <xsl:variable name="write-options" as="map(*)">
+      <xsl:map>
+         <xsl:map-entry key="'indent'" select="$json-indent='yes'"/>
+      </xsl:map>
+   </xsl:variable>
+   <xsl:variable name="source-xml" select="/"/>
+   <xsl:template match="/" name="from-xml">
+      <xsl:param name="source">
+         <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
+            <xsl:when test="exists($file)">
+               <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
+                         select="$file ! document(.,$source-xml)">
+                  <xsl:catch expand-text="true">
+                     <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
+                  </xsl:catch>
+               </xsl:try>
+            </xsl:when>
+            <xsl:otherwise>
+               <xsl:sequence select="/"/>
+            </xsl:otherwise>
+         </xsl:choose>
+      </xsl:param>
+      <xsl:variable name="supermodel">
+         <xsl:apply-templates select="$source/*"/>
+      </xsl:variable>
+      <xsl:variable name="result">
+         <xsl:choose>
+            <xsl:when test="$produce = 'supermodel'">
+               <xsl:sequence select="$supermodel"/>
+            </xsl:when>
+            <xsl:otherwise>
+               <xsl:variable name="new-json-xml">
+                  <xsl:apply-templates select="$supermodel/*" mode="write-json"/>
+               </xsl:variable>
+               <xsl:choose>
+                  <xsl:when test="matches($produce,('xpath|xdm|xml'))">
+                     <xsl:sequence select="$new-json-xml"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                     <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
+                               select="xml-to-json($new-json-xml, $write-options)">
+                        <xsl:catch expand-text="true">
+                           <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
+                        </xsl:catch>
+                     </xsl:try>
+                  </xsl:otherwise>
+               </xsl:choose>
+            </xsl:otherwise>
+         </xsl:choose>
+      </xsl:variable>
+      <xsl:sequence select="$result/*"/>
+      <xsl:if test="matches($result,'\S') and empty($result/*)">
+         <xsl:value-of select="$result" disable-output-escaping="true"/>
+      </xsl:if>
+   </xsl:template>
+   <!-- XML to JSON conversion: object filters -->
+   <xsl:strip-space elements="mapping-collection metadata revision prop link role location address party responsible-party action mapping source-resource target-resource map source target back-matter resource citation rlink"/>
+   <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
+   <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
+   <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
+   <xsl:template match="mapping-collection"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-collection"
+                 key="mapping-collection"
+                 gi="mapping-collection">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping-collection</xsl:attribute>
+         </xsl:if>
+         <xsl:if test=". is /*">
+            <xsl:attribute name="namespace">http://csrc.nist.gov/ns/oscal/1.0</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="metadata"/>
+         <xsl:for-each-group select="mapping" group-by="true()">
+            <group in-json="SINGLETON_OR_ARRAY" key="mappings">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="back-matter"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="metadata"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="metadata" key="metadata" gi="metadata">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">metadata</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
+         <xsl:apply-templates select="revisions"/>
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="role" group-by="true()">
+            <group in-json="ARRAY" key="roles">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location" group-by="true()">
+            <group in-json="ARRAY" key="locations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="party" group-by="true()">
+            <group in-json="ARRAY" key="parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="prop"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="property" gi="prop">
+         <xsl:apply-templates select="@name"/>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@ns"/>
+         <xsl:apply-templates select="@value"/>
+         <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="link"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="link" gi="link">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="@rel"/>
+         <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
+         <xsl:apply-templates select="text"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="action" gi="action">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@system"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping" gi="mapping" key="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="source-resource"/>
+         <xsl:apply-templates select="target-resource"/>
+         <xsl:for-each-group select="map" group-by="true()">
+            <group in-json="ARRAY" key="maps">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="source-resource"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-resource-reference"
+                 key="source-resource"
+                 gi="source-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">source-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@href"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="target-resource"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-resource-reference"
+                 key="target-resource"
+                 gi="target-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@href"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="map" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="map" gi="map">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="relationship"/>
+         <xsl:for-each-group select="source" group-by="true()">
+            <group in-json="ARRAY" key="sources">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="target" group-by="true()">
+            <group in-json="ARRAY" key="targets">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="source"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-item" gi="source">
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@id-ref"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="target"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="mapping-item" gi="target">
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@id-ref"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="back-matter"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">back-matter</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="resource" group-by="true()">
+            <group in-json="ARRAY" key="resources">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="remarks"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">remarks</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="location-uuid"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="party-uuid"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="hash"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
+         <xsl:apply-templates select="@algorithm"/>
+         <value as-type="string" key="value" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@name"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@ns"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@value"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@class"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@href"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@rel"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/document-id/@scheme | mapping-collection/back-matter/resource/document-id/@scheme"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address/@type | mapping-collection/metadata/party/address/@type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/telephone-number/@type | mapping-collection/metadata/party/telephone-number/@type"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/external-id/@scheme"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="responsible-party/@role-id"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source-resource/@type | target-resource/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source-resource/@href | target-resource/@href"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="map/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/map/relationship/@ns"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source/@type | target/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="source/@id-ref | target/@id-ref"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="id-ref"
+             key="id-ref"
+             gi="id-ref">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/rlink/@href"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/rlink/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="hash/@algorithm"
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/base64/@filename"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/base64/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/last-modified"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/oscal-version"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="published"/>
+         <xsl:apply-templates select="last-modified"/>
+         <xsl:apply-templates select="version"/>
+         <xsl:apply-templates select="oscal-version"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="revision"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision/published"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision/last-modified"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <value as-type="dateTime-with-timezone" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision/version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision/oscal-version"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/revisions/revision/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/document-id"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/link/text"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/role/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" key="address" gi="address">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">address</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address/addr-line"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address/city"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address/state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address/postal-code"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/address/country"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/url"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <value as-type="uri" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/location/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/short-name"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/external-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="id" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/email-address"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <value as-type="email" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/telephone-number"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="@type"/>
+         <value as-type="string" key="number" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/address"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="@type"/>
+         <xsl:for-each-group select="addr-line" group-by="true()">
+            <group in-json="ARRAY" key="addr-lines">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="city"/>
+         <xsl:apply-templates select="state"/>
+         <xsl:apply-templates select="postal-code"/>
+         <xsl:apply-templates select="country"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/address/addr-line"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/address/city"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/address/state"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/address/postal-code"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/address/country"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <value as-type="string" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/party/member-of-organization"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/responsible-party/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/source-resource/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/target-resource/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/map/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/map/relationship"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@ns"/>
+         <value as-type="token" key="type" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/map/source/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/mapping/map/target/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="document-id" group-by="true()">
+            <group in-json="ARRAY" key="document-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="citation"/>
+         <xsl:for-each-group select="rlink" group-by="true()">
+            <group in-json="ARRAY" key="rlinks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="base64"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/document-id"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="@scheme"/>
+         <value as-type="string" key="identifier" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/citation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="text"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/citation/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/citation/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/rlink"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="@href"/>
+         <xsl:apply-templates select="@media-type"/>
+         <xsl:for-each-group select="hash" group-by="true()">
+            <group in-json="ARRAY" key="hashes">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="mapping-collection/back-matter/resource/base64"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base64</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@filename"/>
+         <xsl:apply-templates select="@media-type"/>
+         <value as-type="base64Binary" key="value" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="*"
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:element name="{ local-name() }"
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+         <xsl:copy-of select="@*"/>
+         <xsl:apply-templates mode="#current"/>
+      </xsl:element>
+   </xsl:template>
+   <!-- XML to JSON conversion: Supermodel serialization as JSON
+        including markdown production -->
+   <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
+                  name="ns"
+                  select="/*/@namespace"/>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <array>
+         <xsl:copy-of select="@key"/>
+         <xsl:apply-templates mode="#current"/>
+      </array>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <map>
+         <xsl:copy-of select="@key"/>
+         <xsl:apply-templates mode="#current"/>
+      </map>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:apply-templates mode="write-json">
+         <xsl:with-param name="group-key" select="@key"/>
+      </xsl:apply-templates>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+        <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
+      <xsl:param name="group-key" select="()"/>
+      <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
+      <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
+      <!-- this will be an array member unless its group is a singleton or BY_KEY -->
+      <!-- so we want no key except -->
+      <map>
+            <!-- we take a $group-key if given -->
+         <xsl:copy-of select="$group-key"/>
+         <!-- when there's a JSON key flag, we get the key from there -->
+         <xsl:for-each select="flag[@key=$json-key-flag-name]">
+            <xsl:attribute name="key" select="."/>
+         </xsl:for-each>
+         <xsl:apply-templates mode="#current"/>
+      </map>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:param name="group-key" select="()"/>
+      <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
+      <!-- with no flags, this field has only its value -->
+      <xsl:apply-templates mode="write-json">
+         <xsl:with-param name="use-key" select="flag[@key = $json-key-flag-name]"/>
+      </xsl:apply-templates>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <map>
+         <xsl:next-match/>
+      </map>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <map key="{@key}">
+         <xsl:apply-templates mode="#current"/>
+      </map>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <map key="{@key}">
+         <xsl:apply-templates mode="#current"/>
+      </map>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:apply-templates mode="#current"/>
+      <!--
+        <!-\- when there are no flags, the field is a string whose value is the value -\->
+        <string>
+            <xsl:copy-of select="@key"/>
+            <xsl:value-of select="value"/>
+        </string> -->
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
+                    namespace="http://www.w3.org/2005/xpath-functions">
+         <xsl:copy-of select="@key"/>
+         <xsl:apply-templates mode="#current"/>
+      </xsl:element>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
+      <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
+         <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
+         <xsl:apply-templates mode="#current"/>
+      </xsl:element>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:variable name="key-flag-name" select="@key-flag"/>
+      <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
+                    namespace="http://www.w3.org/2005/xpath-functions">
+            <!-- emit a key only if needed -->
+         <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
+         <!-- overriding the key           -->
+         <xsl:if test="exists(@key-flag)">
+            <xsl:attribute name="key">
+               <xsl:apply-templates select="../flag[@name = $key-flag-name]" mode="cast-data"/>
+            </xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="cast-data"/>
+      </xsl:element>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:value-of select="."/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:apply-templates mode="md"/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:variable name="lines" as="node()*">
+         <xsl:apply-templates select="*" mode="md"/>
+      </xsl:variable>
+      <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:if test="exists(preceding-sibling::*)">
+         <string/>
+      </xsl:if>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:variable name="escaped">
+         <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
+      </xsl:variable>
+      <xsl:value-of select="replace($escaped,'\s+',' ')"/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+        <!-- Escapes go here       -->
+        <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
+        <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
+        <!-- prefixes ` ~ ^ * ' " with reverse solidus -->
+      <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
+      <!--<xsl:value-of select="."/>-->
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:call-template name="conditional-lf"/>
+      <string>
+         <xsl:apply-templates mode="md"/>
+      </string>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:call-template name="conditional-lf"/>
+      <string>
+         <xsl:apply-templates select="." mode="mark"/>
+         <xsl:apply-templates mode="md"/>
+      </string>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:call-template name="conditional-lf"/>
+      <xsl:apply-templates select="*" mode="md"/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <string>
+         <xsl:apply-templates select="*" mode="md"/>
+      </string>
+      <xsl:if test="empty(preceding-sibling::tr)">
+         <string>
+            <xsl:text>|</xsl:text>
+            <xsl:for-each select="th | td">
+               <xsl:text> --- |</xsl:text>
+            </xsl:for-each>
+         </string>
+      </xsl:if>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
+      <xsl:text> </xsl:text>
+      <xsl:apply-templates mode="md"/>
+      <xsl:text> |</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:call-template name="conditional-lf"/>
+      <string>```</string>
+      <string>
+         <xsl:apply-templates mode="md"/>
+      </string>
+      <string>```</string>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:call-template name="conditional-lf"/>
+      <xsl:apply-templates mode="md"/>
+      <string/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:apply-templates mode="md"/>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <string>
+         <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
+            <xsl:text>  </xsl:text>
+         </xsl:for-each>
+         <xsl:text>* </xsl:text>
+         <xsl:apply-templates mode="md"/>
+      </string>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <string>
+         <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
+            <xsl:text xml:space="preserve">  </xsl:text>
+         </xsl:for-each>
+         <xsl:text>1. </xsl:text>
+         <xsl:apply-templates mode="md"/>
+      </string>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>`</xsl:text>
+      <xsl:apply-templates mode="md"/>
+      <xsl:text>`</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>*</xsl:text>
+      <xsl:apply-templates mode="md"/>
+      <xsl:text>*</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>**</xsl:text>
+      <xsl:apply-templates mode="md"/>
+      <xsl:text>**</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>"</xsl:text>
+      <xsl:apply-templates mode="md"/>
+      <xsl:text>"</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>{{ insert: </xsl:text>
+      <xsl:value-of select="@type, @id-ref" separator=", "/>
+      <xsl:text> }}</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>[</xsl:text>
+      <xsl:value-of select="."/>
+      <xsl:text>]</xsl:text>
+      <xsl:text>(</xsl:text>
+      <xsl:value-of select="@href"/>
+      <xsl:text>)</xsl:text>
+   </xsl:template>
+   <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:text>![</xsl:text>
+      <xsl:value-of select="(@alt,@src)[1]"/>
+      <xsl:text>]</xsl:text>
+      <xsl:text>(</xsl:text>
+      <xsl:value-of select="@src"/>
+      <xsl:for-each select="@title">
+         <xsl:text expand-text="true"> "{.}"</xsl:text>
+      </xsl:for-each>
+      <xsl:text>)</xsl:text>
+   </xsl:template>
+</xsl:stylesheet>
diff --git a/json/convert/oscal_poam_xml-to-json-converter.xsl b/json/convert/oscal_poam_xml-to-json-converter.xsl
index ee07a12bb5..855d0ed99d 100644
--- a/json/convert/oscal_poam_xml-to-json-converter.xsl
+++ b/json/convert/oscal_poam_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,16 +76,16 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="plan-of-action-and-milestones metadata revision prop link role location address party responsible-party import-ssp local-definitions component status responsible-role protocol port-range inventory-item implemented-component observation origin actor related-task subject include-all include-subject exclude-subject identified-subject relevant-evidence risk characterization facet mitigating-factor response required-asset task timing on-date within-date-range at-frequency dependency associated-activity risk-log entry logged-by related-response related-observation poam-item associated-risk back-matter resource citation rlink"/>
+   <xsl:strip-space elements="plan-of-action-and-milestones metadata revision prop link role location address party responsible-party action import-ssp local-definitions component status responsible-role protocol port-range inventory-item implemented-component assessment-assets assessment-platform uses-component observation origin actor related-task subject include-all include-subject exclude-subject identified-subject relevant-evidence risk characterization facet mitigating-factor response required-asset task timing on-date within-date-range at-frequency dependency associated-activity risk-log entry logged-by related-response related-observation finding target implementation-status associated-risk poam-item related-finding back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="plan-of-action-and-milestones"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="plan-of-action-and-milestones"
-                key="plan-of-action-and-milestones"
-                gi="plan-of-action-and-milestones">
+                 key="plan-of-action-and-milestones"
+                 gi="plan-of-action-and-milestones">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
          </xsl:if>
@@ -111,6 +111,13 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="finding" group-by="true()">
+            <group in-json="ARRAY" key="findings">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="poam-item" group-by="true()">
             <group in-json="ARRAY" key="poam-items">
                <xsl:apply-templates select="current-group()">
@@ -122,7 +129,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -183,11 +190,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -195,67 +209,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -278,21 +253,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -307,65 +275,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -375,7 +286,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-ssp"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-ssp" key="import-ssp" gi="import-ssp">
          <xsl:if test="$with-key">
@@ -386,11 +297,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="local-definitions"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -408,11 +319,12 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:apply-templates select="assessment-assets"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -453,7 +365,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="responsible-role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
@@ -482,7 +394,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="protocol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
@@ -498,7 +410,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="port-range"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
@@ -507,7 +419,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="inventory-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
@@ -543,8 +455,33 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="assessment-assets"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="assessment-assets"
+                 key="assessment-assets"
+                 gi="assessment-assets">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">assessment-assets</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="component" group-by="true()">
+            <group in-json="ARRAY" key="components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="assessment-platform" group-by="true()">
+            <group in-json="ARRAY" key="assessment-platforms">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
    <xsl:template match="observation"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="observation" gi="observation">
          <xsl:apply-templates select="@uuid"/>
@@ -605,7 +542,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="origin"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin" gi="origin">
          <xsl:if test="$with-key">
@@ -628,7 +565,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="actor"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin-actor" gi="actor">
          <xsl:apply-templates select="@type"/>
@@ -651,7 +588,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="related-task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="related-task" gi="related-task">
          <xsl:apply-templates select="@task-uuid"/>
@@ -688,7 +625,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="assessment-subject" gi="subject">
          <xsl:apply-templates select="@type"/>
@@ -726,19 +663,19 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-all"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
    <xsl:template match="include-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="include-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -761,7 +698,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="exclude-subject"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-subject-by-id" gi="exclude-subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -784,7 +721,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="risk"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="risk" gi="risk">
          <xsl:apply-templates select="@uuid"/>
@@ -853,7 +790,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="characterization"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="characterization" gi="characterization">
          <xsl:for-each-group select="prop" group-by="true()">
@@ -881,7 +818,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="task"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="task" gi="task">
          <xsl:apply-templates select="@uuid"/>
@@ -942,15 +879,105 @@
       </assembly>
    </xsl:template>
    <xsl:template match="logged-by"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="logged-by" gi="logged-by">
          <xsl:apply-templates select="@party-uuid"/>
          <xsl:apply-templates select="@role-id"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="finding"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="finding" gi="finding">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="origin" group-by="true()">
+            <group in-json="ARRAY" key="origins">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="target"/>
+         <xsl:apply-templates select="implementation-statement-uuid"/>
+         <xsl:for-each-group select="related-observation" group-by="true()">
+            <group in-json="ARRAY" key="related-observations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="associated-risk" group-by="true()">
+            <group in-json="ARRAY" key="related-risks">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="target"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="finding-target" key="target" gi="target">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="@target-id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="status"/>
+         <xsl:apply-templates select="implementation-status"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="implementation-status"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="implementation-status"
+                 key="implementation-status"
+                 gi="implementation-status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="poam-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="poam-item" gi="poam-item">
          <xsl:apply-templates select="@uuid"/>
@@ -977,6 +1004,13 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="related-finding" group-by="true()">
+            <group in-json="ARRAY" key="related-findings">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:for-each-group select="related-observation" group-by="true()">
             <group in-json="ARRAY" key="related-observations">
                <xsl:apply-templates select="current-group()">
@@ -995,7 +1029,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -1011,60 +1045,60 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-id"
-             key="system-id"
-             gi="system-id">
+              as-type="string"
+              name="system-id"
+              key="system-id"
+              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
          </xsl:if>
@@ -1075,14 +1109,14 @@
       </field>
    </xsl:template>
    <xsl:template match="status"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status"
-             gi="status"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status"
+              gi="status"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -1092,7 +1126,7 @@
       </field>
    </xsl:template>
    <xsl:template match="threat-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="uri" name="threat-id" gi="threat-id">
          <xsl:apply-templates select="@system"/>
@@ -1103,14 +1137,14 @@
       </field>
    </xsl:template>
    <xsl:template match="status-change"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status-change"
-             gi="status-change"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status-change"
+              gi="status-change"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
@@ -1120,7 +1154,7 @@
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -1130,863 +1164,1055 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-ssp/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-id/@identifier-type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="identifier-type"
-            key="identifier-type"
-            gi="identifier-type">
+             as-type="uri"
+             name="identifier-type"
+             key="identifier-type"
+             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/status/@state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/component/status/@state | plan-of-action-and-milestones/local-definitions/assessment-assets/component/status/@state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-role/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@start"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@end"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@transport"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="inventory-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/@uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="observation/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@actor-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="actor-uuid"
-            key="actor-uuid"
-            gi="actor-uuid">
+             as-type="uuid"
+             name="actor-uuid"
+             key="actor-uuid"
+             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="actor/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="related-task/@task-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="subject/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@subject-uuid | exclude-subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="include-subject/@type | exclude-subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/finding/origin/related-task/identified-subject/@subject-placeholder-uuid"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-placeholder-uuid"
-            key="subject-placeholder-uuid"
-            gi="subject-placeholder-uuid">
+             as-type="uuid"
+             name="subject-placeholder-uuid"
+             key="subject-placeholder-uuid"
+             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/subject/@subject-uuid | plan-of-action-and-milestones/risk/mitigating-factor/subject/@subject-uuid | plan-of-action-and-milestones/risk/response/required-asset/subject/@subject-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/subject/@type | plan-of-action-and-milestones/risk/mitigating-factor/subject/@type | plan-of-action-and-milestones/risk/response/required-asset/subject/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/@href"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="risk/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="threat-id/@system"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="threat-id/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet/@name"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet/@system"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet/@value"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/@uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="implementation-uuid"
-            key="implementation-uuid"
-            gi="implementation-uuid">
+             as-type="uuid"
+             name="implementation-uuid"
+             key="implementation-uuid"
+             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/@uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/@lifecycle"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="lifecycle"
-            key="lifecycle"
-            gi="lifecycle">
+             as-type="token"
+             name="lifecycle"
+             key="lifecycle"
+             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/@uuid"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="task/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="task/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/on-date/@date"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="logged-by/@party-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="party-uuid"
-            key="party-uuid"
-            gi="party-uuid">
+             as-type="uuid"
+             name="party-uuid"
+             key="party-uuid"
+             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="logged-by/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="response-uuid"
-            key="response-uuid"
-            gi="response-uuid">
+             as-type="uuid"
+             name="response-uuid"
+             key="response-uuid"
+             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/related-observation/@observation-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="poam-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="finding/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="target/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="target/@target-id"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="token"
+             name="target-id"
+             key="target-id"
+             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/target/status/@state"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/target/status/@reason"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="token"
+             name="reason"
+             key="reason"
+             gi="reason">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="implementation-status/@state"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/related-observation/@observation-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="plan-of-action-and-milestones/finding/associated-risk/@risk-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="poam-item/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <value as-type="markup-line" in-json="string">
-            <xsl:apply-templates mode="cast-prose"/>
-         </value>
-      </field>
+   <xsl:template match="plan-of-action-and-milestones/poam-item/related-finding/@finding-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="finding-uuid"
+             key="finding-uuid"
+             gi="finding-uuid">
+         <xsl:value-of select="."/>
+      </flag>
    </xsl:template>
-   <xsl:template match="plan-of-action-and-milestones/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
+   <xsl:template match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/rlink/@href"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/rlink/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="hash/@algorithm"
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/base64/@filename"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/back-matter/resource/base64/@media-type"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/title"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/published"
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1996,15 +2222,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2014,15 +2240,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2032,15 +2258,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2050,8 +2276,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -2077,14 +2303,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2092,15 +2318,15 @@
       </group>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2110,15 +2336,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -2128,15 +2354,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2146,15 +2372,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2164,15 +2390,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2182,15 +2408,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2200,13 +2426,13 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -2214,15 +2440,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2231,16 +2457,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2250,15 +2502,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2268,37 +2520,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2307,16 +2559,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2326,8 +2624,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -2348,29 +2646,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2380,15 +2678,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2398,15 +2696,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2416,15 +2714,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2434,27 +2732,27 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -2462,29 +2760,30 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2493,16 +2792,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2512,15 +2879,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2530,13 +2897,13 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -2544,15 +2911,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2562,27 +2929,27 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -2590,8 +2957,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -2609,29 +2976,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2641,15 +3008,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2659,15 +3026,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2677,15 +3044,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2695,29 +3062,65 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2727,15 +3130,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2745,37 +3148,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -2785,15 +3188,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2803,8 +3206,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -2815,15 +3218,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2833,15 +3236,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2851,37 +3254,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2891,15 +3294,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2909,8 +3312,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -2939,15 +3342,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2957,15 +3360,272 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/description"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/purpose"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">purpose</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/status"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/responsible-role/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/protocol/title"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="uses-component" group-by="true()">
+            <group in-json="ARRAY" key="uses-components">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/title"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/link/text"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="@component-uuid"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2975,15 +3635,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2993,37 +3653,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3033,43 +3693,43 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/method"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/type"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/actor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3079,15 +3739,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3097,15 +3757,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3115,37 +3775,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3155,15 +3815,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3173,15 +3833,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3191,12 +3851,12 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -3211,37 +3871,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3251,15 +3911,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3269,15 +3929,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3287,8 +3947,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/subject"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -3312,15 +3972,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/subject/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3330,15 +3990,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/subject/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3348,8 +4008,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="relevant-evidence" gi="relevant-evidence">
          <xsl:apply-templates select="@href"/>
@@ -3372,37 +4032,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/relevant-evidence/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3412,15 +4072,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/collected"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
@@ -3430,15 +4090,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/observation/expires"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expires</xsl:attribute>
          </xsl:if>
@@ -3448,15 +4108,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3466,59 +4126,59 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/statement"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3528,15 +4188,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/actor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3546,15 +4206,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3564,15 +4224,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3582,37 +4242,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3622,15 +4282,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3640,15 +4300,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3658,12 +4318,12 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -3678,37 +4338,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3718,15 +4378,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3736,15 +4396,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3754,15 +4414,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3772,15 +4432,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3790,15 +4450,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3808,15 +4468,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3826,37 +4486,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3866,15 +4526,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3884,15 +4544,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3902,12 +4562,12 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -3922,37 +4582,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3962,15 +4622,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3980,15 +4640,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3998,8 +4658,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="facet" gi="facet">
          <xsl:apply-templates select="@name"/>
@@ -4023,15 +4683,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/characterization/facet/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4041,8 +4701,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="mitigating-factor" gi="mitigating-factor">
          <xsl:apply-templates select="@uuid"/>
@@ -4072,37 +4732,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4112,8 +4772,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -4137,15 +4797,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4155,15 +4815,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4173,15 +4833,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/deadline"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">deadline</xsl:attribute>
          </xsl:if>
@@ -4191,8 +4851,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="response" gi="response">
          <xsl:apply-templates select="@uuid"/>
@@ -4238,15 +4898,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4256,37 +4916,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4296,15 +4956,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/actor/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4314,15 +4974,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4332,15 +4992,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4350,37 +5010,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4390,15 +5050,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4408,15 +5068,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4426,12 +5086,12 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -4446,37 +5106,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4486,15 +5146,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4504,15 +5164,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4522,8 +5182,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="required-asset" gi="required-asset">
          <xsl:apply-templates select="@uuid"/>
@@ -4554,8 +5214,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="@subject-uuid"/>
@@ -4579,15 +5239,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject/title"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4597,15 +5257,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4615,15 +5275,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4633,37 +5293,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response/required-asset/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4673,15 +5333,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/title"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4691,37 +5351,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4731,8 +5391,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
@@ -4744,8 +5404,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/on-date"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
          <xsl:if test="$with-key">
@@ -4755,13 +5415,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -4770,13 +5430,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -4785,8 +5445,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/dependency"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="dependency" gi="dependency">
          <xsl:apply-templates select="@task-uuid"/>
@@ -4794,8 +5454,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="associated-activity" gi="associated-activity">
          <xsl:apply-templates select="@activity-uuid"/>
@@ -4831,15 +5491,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4849,15 +5509,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4867,37 +5527,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4907,15 +5567,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4925,15 +5585,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4943,37 +5603,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4983,15 +5643,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5001,15 +5661,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5019,15 +5679,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5037,8 +5697,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
@@ -5054,8 +5714,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="entry" gi="entry">
          <xsl:apply-templates select="@uuid"/>
@@ -5096,15 +5756,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5114,37 +5774,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/start"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -5154,15 +5814,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/end"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -5172,15 +5832,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5190,8 +5850,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="related-response" gi="related-response">
          <xsl:apply-templates select="@response-uuid"/>
@@ -5220,15 +5880,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5238,15 +5898,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5256,15 +5916,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5274,37 +5934,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5314,15 +5974,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5332,15 +5992,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text"
-                 priority="18"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="18"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5350,12 +6010,12 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -5370,37 +6030,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5410,15 +6070,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text"
-                 priority="20"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="20"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5428,15 +6088,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text"
-                 priority="19"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="19"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5446,23 +6106,412 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/risk/related-observation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="@observation-uuid"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/title"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/description"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/link/text"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/actor/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/link/text"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/responsible-party/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/description"
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/link/text"
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/include-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/subject/exclude-subject/link/text"
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject"
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@subject-placeholder-uuid"/>
+         <xsl:for-each-group select="subject" group-by="true()">
+            <group in-json="ARRAY" key="subjects">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/description"
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/link/text"
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/include-subject/link/text"
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text"
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/title"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/description"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-multiline" in-json="string">
+            <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                                 group-by="true()">
+               <xsl:apply-templates select="current-group()" mode="cast-prose"/>
+            </xsl:for-each-group>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/target/status"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="@state"/>
+         <xsl:apply-templates select="@reason"/>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/implementation-statement-uuid"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+         </xsl:if>
+         <value as-type="uuid" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/related-observation"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/finding/associated-risk"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
+         <xsl:apply-templates select="@risk-uuid"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/title"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5472,37 +6521,37 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5512,8 +6561,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/origin"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="origin" gi="origin">
          <xsl:for-each-group select="actor" group-by="true()">
@@ -5526,15 +6575,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/origin/actor/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5543,25 +6592,33 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="plan-of-action-and-milestones/poam-item/related-finding"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="related-finding" gi="related-finding">
+         <xsl:apply-templates select="@finding-uuid"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/related-observation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="@observation-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/poam-item/associated-risk"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="associated-risk" gi="associated-risk">
          <xsl:apply-templates select="@risk-uuid"/>
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -5594,15 +6651,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5612,35 +6669,35 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -5648,8 +6705,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -5673,15 +6730,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5691,15 +6748,15 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5709,8 +6766,8 @@
       </field>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -5725,14 +6782,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="plan-of-action-and-milestones/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -5744,10 +6801,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -5755,43 +6812,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -5809,10 +6866,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -5821,33 +6878,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -5857,24 +6914,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -5882,12 +6939,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -5900,46 +6957,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -5948,18 +7005,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -5967,40 +7024,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -6014,19 +7071,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -6035,24 +7092,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -6062,9 +7119,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -6074,49 +7131,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -6125,9 +7182,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_profile_xml-to-json-converter.xsl b/json/convert/oscal_profile_xml-to-json-converter.xsl
index 49faa0d217..2c1b8ee4cc 100644
--- a/json/convert/oscal_profile_xml-to-json-converter.xsl
+++ b/json/convert/oscal_profile_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,12 +76,12 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="profile metadata revision prop link role location address party responsible-party import include-all include-controls matching exclude-controls merge combine flat custom group param constraint test guideline select part insert-controls modify set-parameter alter remove add back-matter resource citation rlink"/>
+   <xsl:strip-space elements="profile metadata revision prop link role location address party responsible-party action import include-all include-controls matching exclude-controls merge combine flat custom group param constraint test guideline select part insert-controls modify set-parameter alter remove add back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="profile"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="profile" key="profile" gi="profile">
          <xsl:if test="$with-key">
@@ -105,7 +105,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -166,11 +166,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -178,67 +185,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -261,21 +229,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -290,65 +251,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -358,7 +262,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import" gi="import">
          <xsl:apply-templates select="@href"/>
@@ -380,19 +284,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="include-all"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
+   <xsl:template match="matching"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="matching" gi="matching">
+         <xsl:apply-templates select="@pattern"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="merge"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="merge" key="merge" gi="merge">
          <xsl:if test="$with-key">
@@ -405,7 +316,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="group"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="group" gi="group">
          <xsl:apply-templates select="@id"/>
@@ -456,7 +367,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="param"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter" gi="param">
          <xsl:apply-templates select="@id"/>
@@ -504,7 +415,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="constraint"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-constraint" gi="constraint">
          <xsl:apply-templates select="description"/>
@@ -518,21 +429,21 @@
       </assembly>
    </xsl:template>
    <xsl:template match="guideline"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-guideline" gi="guideline">
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -540,7 +451,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="select"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="parameter-selection" key="select" gi="select">
          <xsl:if test="$with-key">
@@ -557,7 +468,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="part"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="part" gi="part">
          <xsl:apply-templates select="@id"/>
@@ -573,17 +484,17 @@
             </group>
          </xsl:for-each-group>
          <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                             group-by="true()">
+                              group-by="true()">
             <field in-json="SCALAR"
-                   in-xml="UNWRAPPED"
-                   collapsible="no"
-                   as-type="markup-multiline"
-                   name="prose"
-                   key="prose">
+                    in-xml="UNWRAPPED"
+                    collapsible="no"
+                    as-type="markup-multiline"
+                    name="prose"
+                    key="prose">
                <value in-json="string"
-                      as-type="markup-multiline"
-                      _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                      _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE">
+                       as-type="markup-multiline"
+                       _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                       _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE">
                   <xsl:apply-templates select="current-group()" mode="cast-prose"/>
                </value>
             </field>
@@ -605,7 +516,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="insert-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="insert-controls" gi="insert-controls">
          <xsl:apply-templates select="@order"/>
@@ -627,7 +538,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="modify"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="modify" key="modify" gi="modify">
          <xsl:if test="$with-key">
@@ -649,76 +560,8 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="alter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="alter" gi="alter">
-         <xsl:apply-templates select="@control-id"/>
-         <xsl:for-each-group select="remove" group-by="true()">
-            <group in-json="ARRAY" key="removes">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="add" group-by="true()">
-            <group in-json="ARRAY" key="adds">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="remove"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="remove" gi="remove">
-         <xsl:apply-templates select="@by-name"/>
-         <xsl:apply-templates select="@by-class"/>
-         <xsl:apply-templates select="@by-id"/>
-         <xsl:apply-templates select="@by-item-name"/>
-         <xsl:apply-templates select="@by-ns"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="add" xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="add" gi="add">
-         <xsl:apply-templates select="@position"/>
-         <xsl:apply-templates select="@by-id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:for-each-group select="param" group-by="true()">
-            <group in-json="ARRAY" key="params">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="part" group-by="true()">
-            <group in-json="ARRAY" key="parts">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-      </assembly>
-   </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -734,67 +577,80 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="with-id"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="token"
+              name="with-id"
+              gi="with-id"
+              in-json="SCALAR">
+         <value as-type="token" in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
    <xsl:template match="value"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="parameter-value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="parameter-value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -804,536 +660,613 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="profile/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address/@type | profile/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/import/include-controls/@with-child-controls | profile/import/exclude-controls/@with-child-controls | profile/merge/custom//group/insert-controls/include-controls/@with-child-controls | profile/merge/custom//group/insert-controls/exclude-controls/@with-child-controls | profile/merge/custom/insert-controls/include-controls/@with-child-controls | profile/merge/custom/insert-controls/exclude-controls/@with-child-controls"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="with-child-controls"
-            key="with-child-controls"
-            gi="with-child-controls">
+             as-type="token"
+             name="with-child-controls"
+             key="with-child-controls"
+             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="profile/import/include-controls/matching/@pattern | profile/import/exclude-controls/matching/@pattern | profile/merge/custom//group/insert-controls/include-controls/matching/@pattern | profile/merge/custom//group/insert-controls/exclude-controls/matching/@pattern | profile/merge/custom/insert-controls/include-controls/matching/@pattern | profile/merge/custom/insert-controls/exclude-controls/matching/@pattern"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="matching/@pattern"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="pattern"
-            key="pattern"
-            gi="pattern">
+             as-type="string"
+             name="pattern"
+             key="pattern"
+             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/merge/combine/@method"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="method"
-            key="method"
-            gi="method">
+             as-type="string"
+             name="method"
+             key="method"
+             gi="method">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="group/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="param/@depends-on"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="select/@how-many"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="how-many"
-            key="how-many"
-            gi="how-many">
+             as-type="token"
+             name="how-many"
+             key="how-many"
+             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="part/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="insert-controls/@order"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="order"
-            key="order"
-            gi="order">
+             as-type="token"
+             name="order"
+             key="order"
+             gi="order">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/@param-id"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/@class"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/@depends-on"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="alter/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/@control-id"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-name"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-name"
-            key="by-name"
-            gi="by-name">
+             as-type="token"
+             name="by-name"
+             key="by-name"
+             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-class"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-class"
-            key="by-class"
-            gi="by-class">
+             as-type="token"
+             name="by-class"
+             key="by-class"
+             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-id"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-item-name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-item-name"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-item-name"
-            key="by-item-name"
-            gi="by-item-name">
+             as-type="token"
+             name="by-item-name"
+             key="by-item-name"
+             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="remove/@by-ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/remove/@by-ns"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-ns"
-            key="by-ns"
-            gi="by-ns">
+             as-type="token"
+             name="by-ns"
+             key="by-ns"
+             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="add/@position"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/add/@position"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="position"
-            key="position"
-            gi="position">
+             as-type="token"
+             name="position"
+             key="position"
+             default="ending"
+             gi="position">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="add/@by-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="profile/modify/alter/add/@by-id"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="profile/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1343,15 +1276,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1361,15 +1294,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1379,15 +1312,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1397,15 +1330,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1415,8 +1348,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -1442,14 +1375,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1457,15 +1390,15 @@
       </group>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1475,15 +1408,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1493,15 +1426,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1511,15 +1444,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1529,15 +1462,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1547,15 +1480,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1565,13 +1498,13 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -1579,15 +1512,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1596,16 +1529,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="profile/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="profile/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1615,15 +1574,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1633,37 +1592,37 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1672,16 +1631,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="profile/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="profile/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1691,8 +1696,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -1713,29 +1718,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1745,15 +1750,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1763,15 +1768,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1781,15 +1786,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1799,27 +1804,27 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -1827,29 +1832,30 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1858,16 +1864,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="profile/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="profile/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -1877,15 +1951,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1895,13 +1969,13 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -1909,15 +1983,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1927,27 +2001,27 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -1955,8 +2029,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -1974,29 +2048,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2006,15 +2080,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2024,15 +2098,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2042,15 +2116,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2060,29 +2134,65 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="profile/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2092,8 +2202,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/import/include-controls"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -2113,31 +2223,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/import/include-controls/with-id"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/import/include-controls/matching"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/import/exclude-controls"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -2157,31 +2245,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/import/exclude-controls/with-id"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/import/exclude-controls/matching"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/combine"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="combine" key="combine" gi="combine">
          <xsl:if test="$with-key">
@@ -2191,8 +2257,8 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/merge/flat"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="flat" key="flat" gi="flat">
          <xsl:if test="$with-key">
@@ -2201,15 +2267,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/merge/as-is"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="boolean"
-             name="as-is"
-             key="as-is"
-             gi="as-is"
-             in-json="SCALAR">
+              as-type="boolean"
+              name="as-is"
+              key="as-is"
+              gi="as-is"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">as-is</xsl:attribute>
          </xsl:if>
@@ -2219,8 +2285,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="custom" key="custom" gi="custom">
          <xsl:if test="$with-key">
@@ -2243,15 +2309,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2261,15 +2327,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2279,15 +2345,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/label"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2297,52 +2363,52 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/usage"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/constraint/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/constraint/test"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -2350,15 +2416,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/constraint/test/expression"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2368,29 +2434,29 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/param/select/choice"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2400,15 +2466,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group//part/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2418,15 +2484,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group//part/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2436,8 +2502,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/merge/custom//group/insert-controls/include-controls"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -2457,31 +2523,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/include-controls/with-id"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/include-controls/matching"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/custom//group/insert-controls/exclude-controls"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -2501,31 +2545,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/exclude-controls/with-id"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom//group/insert-controls/exclude-controls/matching"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/custom/insert-controls/include-controls"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="include-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -2545,31 +2567,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/include-controls/with-id"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/include-controls/matching"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/merge/custom/insert-controls/exclude-controls"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="select-control-by-id" gi="exclude-controls">
          <xsl:apply-templates select="@with-child-controls"/>
@@ -2589,31 +2589,9 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/exclude-controls/with-id"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <value as-type="token" in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="profile/merge/custom/insert-controls/exclude-controls/matching"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="@pattern"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="profile/modify/set-parameter"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
@@ -2660,15 +2638,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2678,15 +2656,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/label"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2696,52 +2674,52 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/usage"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/constraint/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/constraint/test"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -2749,15 +2727,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/constraint/test/expression"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2767,29 +2745,101 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/set-parameter/select/choice"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="profile/modify/alter"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="alter" gi="alter">
+         <xsl:apply-templates select="@control-id"/>
+         <xsl:for-each-group select="remove" group-by="true()">
+            <group in-json="ARRAY" key="removes">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="add" group-by="true()">
+            <group in-json="ARRAY" key="adds">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/modify/alter/remove"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly as-type="empty" name="remove" gi="remove">
+         <xsl:apply-templates select="@by-name"/>
+         <xsl:apply-templates select="@by-class"/>
+         <xsl:apply-templates select="@by-id"/>
+         <xsl:apply-templates select="@by-item-name"/>
+         <xsl:apply-templates select="@by-ns"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="profile/modify/alter/add"
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="add" gi="add">
+         <xsl:apply-templates select="@position"/>
+         <xsl:apply-templates select="@by-id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:for-each-group select="param" group-by="true()">
+            <group in-json="ARRAY" key="params">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="part" group-by="true()">
+            <group in-json="ARRAY" key="parts">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+      </assembly>
+   </xsl:template>
    <xsl:template match="profile/modify/alter/add/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2799,15 +2849,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2817,15 +2867,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/label"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2835,52 +2885,52 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/usage"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/constraint/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/constraint/test"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="test" gi="test">
          <xsl:apply-templates select="expression"/>
@@ -2888,15 +2938,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/constraint/test/expression"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2906,29 +2956,29 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/param/select/choice"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <value as-type="markup-line" in-json="string">
             <xsl:apply-templates mode="cast-prose"/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2938,15 +2988,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add//part/title"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2956,15 +3006,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/modify/alter/add//part/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2974,8 +3024,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -3008,15 +3058,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3026,35 +3076,35 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -3062,8 +3112,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -3087,15 +3137,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3105,15 +3155,15 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3123,8 +3173,8 @@
       </field>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -3139,14 +3189,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="profile/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -3158,10 +3208,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -3169,43 +3219,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -3223,10 +3273,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -3235,33 +3285,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -3271,24 +3321,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -3296,12 +3346,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -3314,46 +3364,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -3362,18 +3412,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -3381,40 +3431,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -3428,19 +3478,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -3449,24 +3499,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -3476,9 +3526,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -3488,49 +3538,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -3539,9 +3589,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/convert/oscal_ssp_xml-to-json-converter.xsl b/json/convert/oscal_ssp_xml-to-json-converter.xsl
index 4292af08c2..2a0a17ecb8 100644
--- a/json/convert/oscal_ssp_xml-to-json-converter.xsl
+++ b/json/convert/oscal_ssp_xml-to-json-converter.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0"
-                exclude-result-prefixes="#all"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 version="3.0"
+                 exclude-result-prefixes="#all"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
 <!-- XML to JSON conversion: pipeline -->
 <!-- Supports either of two interfaces:
       simply handle the XML as source (easier), producing the JSON as output, or
@@ -31,7 +31,7 @@
          <xsl:choose><!-- evaluating $file as URI relative to nominal source directory -->
             <xsl:when test="exists($file)">
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="$file ! document(.,$source-xml)">
+                         select="$file ! document(.,$source-xml)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                   </xsl:catch>
@@ -60,7 +60,7 @@
                   </xsl:when>
                   <xsl:otherwise>
                      <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                              select="xml-to-json($new-json-xml, $write-options)">
+                               select="xml-to-json($new-json-xml, $write-options)">
                         <xsl:catch expand-text="true">
                            <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
                         </xsl:catch>
@@ -76,16 +76,16 @@
       </xsl:if>
    </xsl:template>
    <!-- XML to JSON conversion: object filters -->
-   <xsl:strip-space elements="system-security-plan metadata revision prop link role location address party responsible-party import-profile system-characteristics system-information information-type categorization confidentiality-impact integrity-impact availability-impact security-impact-level status authorization-boundary diagram network-architecture data-flow system-implementation leveraged-authorization user authorized-privilege component responsible-role protocol port-range inventory-item implemented-component control-implementation set-parameter implemented-requirement statement by-component implementation-status export provided responsibility inherited satisfied back-matter resource citation rlink"/>
+   <xsl:strip-space elements="system-security-plan metadata revision prop link role location address party responsible-party action import-profile system-characteristics system-information information-type categorization confidentiality-impact integrity-impact availability-impact security-impact-level status authorization-boundary diagram network-architecture data-flow system-implementation leveraged-authorization user authorized-privilege component responsible-role protocol port-range inventory-item implemented-component control-implementation set-parameter implemented-requirement statement by-component implementation-status export provided responsibility inherited satisfied back-matter resource citation rlink"/>
    <!-- METASCHEMA conversion stylesheet supports XML -> METASCHEMA/SUPERMODEL conversion -->
    <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
    <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
    <xsl:template match="system-security-plan"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-security-plan"
-                key="system-security-plan"
-                gi="system-security-plan">
+                 key="system-security-plan"
+                 gi="system-security-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
          </xsl:if>
@@ -102,7 +102,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="metadata"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="metadata" key="metadata" gi="metadata">
          <xsl:if test="$with-key">
@@ -163,11 +163,18 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
+         <xsl:for-each-group select="action" group-by="true()">
+            <group in-json="ARRAY" key="actions">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="prop"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="property" gi="prop">
          <xsl:apply-templates select="@name"/>
@@ -175,67 +182,28 @@
          <xsl:apply-templates select="@ns"/>
          <xsl:apply-templates select="@value"/>
          <xsl:apply-templates select="@class"/>
+         <xsl:apply-templates select="@group"/>
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
    <xsl:template match="link"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="link" gi="link">
          <xsl:apply-templates select="@href"/>
          <xsl:apply-templates select="@rel"/>
          <xsl:apply-templates select="@media-type"/>
+         <xsl:apply-templates select="@resource-fragment"/>
          <xsl:apply-templates select="text"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="@id"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:apply-templates select="description"/>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="location"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="responsible-party"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="@uuid"/>
-         <xsl:apply-templates select="title"/>
-         <xsl:apply-templates select="address"/>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="url" group-by="true()">
-            <group in-json="ARRAY" key="urls">
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="@role-id"/>
+         <xsl:for-each-group select="party-uuid" group-by="true()">
+            <group in-json="ARRAY" key="party-uuids">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -258,21 +226,14 @@
          <xsl:apply-templates select="remarks"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="action"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
-      <assembly name="party" gi="party">
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@date"/>
          <xsl:apply-templates select="@type"/>
-         <xsl:apply-templates select="name"/>
-         <xsl:apply-templates select="short-name"/>
-         <xsl:for-each-group select="external-id" group-by="true()">
-            <group in-json="ARRAY" key="external-ids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
+         <xsl:apply-templates select="@system"/>
          <xsl:for-each-group select="prop" group-by="true()">
             <group in-json="ARRAY" key="props">
                <xsl:apply-templates select="current-group()">
@@ -287,65 +248,8 @@
                </xsl:apply-templates>
             </group>
          </xsl:for-each-group>
-         <xsl:for-each-group select="email-address" group-by="true()">
-            <group in-json="ARRAY" key="email-addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="telephone-number" group-by="true()">
-            <group in-json="ARRAY" key="telephone-numbers">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="address" group-by="true()">
-            <group in-json="ARRAY" key="addresses">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="location-uuid" group-by="true()">
-            <group in-json="ARRAY" key="location-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="member-of-organization" group-by="true()">
-            <group in-json="ARRAY" key="member-of-organizations">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="remarks"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="responsible-party"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="@role-id"/>
-         <xsl:for-each-group select="party-uuid" group-by="true()">
-            <group in-json="ARRAY" key="party-uuids">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
+         <xsl:for-each-group select="responsible-party" group-by="true()">
+            <group in-json="ARRAY" key="responsible-parties">
                <xsl:apply-templates select="current-group()">
                   <xsl:with-param name="with-key" select="false()"/>
                </xsl:apply-templates>
@@ -355,7 +259,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="import-profile"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="import-profile" key="import-profile" gi="import-profile">
          <xsl:if test="$with-key">
@@ -366,11 +270,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-characteristics"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-characteristics"
-                key="system-characteristics"
-                gi="system-characteristics">
+                 key="system-characteristics"
+                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
          </xsl:if>
@@ -417,11 +321,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-information"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-information"
-                key="system-information"
-                gi="system-information">
+                 key="system-information"
+                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
          </xsl:if>
@@ -448,12 +352,92 @@
          </xsl:for-each-group>
       </assembly>
    </xsl:template>
+   <xsl:template match="confidentiality-impact"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="impact"
+                 key="confidentiality-impact"
+                 gi="confidentiality-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="base"/>
+         <xsl:apply-templates select="selected"/>
+         <xsl:apply-templates select="adjustment-justification"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="integrity-impact"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="impact" key="integrity-impact" gi="integrity-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">integrity-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="base"/>
+         <xsl:apply-templates select="selected"/>
+         <xsl:apply-templates select="adjustment-justification"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="availability-impact"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="impact" key="availability-impact" gi="availability-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">availability-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="base"/>
+         <xsl:apply-templates select="selected"/>
+         <xsl:apply-templates select="adjustment-justification"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="security-impact-level"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="security-impact-level"
-                key="security-impact-level"
-                gi="security-impact-level">
+                 key="security-impact-level"
+                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
          </xsl:if>
@@ -463,11 +447,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="authorization-boundary"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="authorization-boundary"
-                key="authorization-boundary"
-                gi="authorization-boundary">
+                 key="authorization-boundary"
+                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
          </xsl:if>
@@ -497,7 +481,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="diagram"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="diagram" gi="diagram">
          <xsl:apply-templates select="@uuid"/>
@@ -521,11 +505,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="network-architecture"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="network-architecture"
-                key="network-architecture"
-                gi="network-architecture">
+                 key="network-architecture"
+                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
          </xsl:if>
@@ -555,7 +539,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="data-flow"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="data-flow" key="data-flow" gi="data-flow">
          <xsl:if test="$with-key">
@@ -587,11 +571,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-implementation"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-implementation"
-                key="system-implementation"
-                gi="system-implementation">
+                 key="system-implementation"
+                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
          </xsl:if>
@@ -641,7 +625,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="user"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-user" gi="user">
          <xsl:apply-templates select="@uuid"/>
@@ -680,7 +664,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="authorized-privilege"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="authorized-privilege" gi="authorized-privilege">
          <xsl:apply-templates select="title"/>
@@ -695,7 +679,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="system-component" gi="component">
          <xsl:apply-templates select="@uuid"/>
@@ -736,7 +720,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="responsible-role"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsible-role" gi="responsible-role">
          <xsl:apply-templates select="@role-id"/>
@@ -765,7 +749,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="protocol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="protocol" gi="protocol">
          <xsl:apply-templates select="@uuid"/>
@@ -781,7 +765,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="port-range"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly as-type="empty" name="port-range" gi="port-range">
          <xsl:apply-templates select="@start"/>
@@ -790,7 +774,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="inventory-item"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inventory-item" gi="inventory-item">
          <xsl:apply-templates select="@uuid"/>
@@ -827,7 +811,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="set-parameter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="set-parameter" gi="set-parameter">
          <xsl:apply-templates select="@param-id"/>
@@ -842,7 +826,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="by-component"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="by-component" gi="by-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -896,11 +880,11 @@
       </assembly>
    </xsl:template>
    <xsl:template match="implementation-status"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implementation-status"
-                key="implementation-status"
-                gi="implementation-status">
+                 key="implementation-status"
+                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
          </xsl:if>
@@ -909,7 +893,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="back-matter"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="back-matter" key="back-matter" gi="back-matter">
          <xsl:if test="$with-key">
@@ -925,59 +909,59 @@
       </assembly>
    </xsl:template>
    <xsl:template match="remarks"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="location-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="party-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-id"
-             gi="system-id">
+              as-type="string"
+              name="system-id"
+              gi="system-id">
          <xsl:apply-templates select="@identifier-type"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -985,33 +969,33 @@
       </field>
    </xsl:template>
    <xsl:template match="role-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <value as-type="token" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="function-performed"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="hash"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no" as-type="string" name="hash" gi="hash">
          <xsl:apply-templates select="@algorithm"/>
@@ -1021,634 +1005,705 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@ns"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@value"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="prop/@class"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="link/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="prop/@group"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="link/@rel"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="link/@href"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@rel"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="link/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="link/@resource-fragment"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="role/@id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/role/@id"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="location/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/location/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/@uuid"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="party/@type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+   <xsl:template match="system-security-plan/metadata/party/@type"
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/external-id/@scheme"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-party/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@uuid"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@date"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@type"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="action/@system"
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="import-profile/@href"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-id/@identifier-type"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="identifier-type"
-            key="identifier-type"
-            gi="identifier-type">
+             as-type="uri"
+             name="identifier-type"
+             key="identifier-type"
+             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/@uuid"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/status/@state"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="string"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="diagram/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="user/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="component/@type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/status/@state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="responsible-role/@role-id"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="protocol/@name"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@start"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@end"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="port-range/@transport"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="inventory-item/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="set-parameter/@param-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/@control-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/@statement-id"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="by-component/@component-uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="by-component/@uuid"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="implementation-status/@state"
-                 priority="1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@provided-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@provided-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@responsibility-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@responsibility-uuid"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="responsibility-uuid"
-            key="responsibility-uuid"
-            gi="responsibility-uuid">
+             as-type="uuid"
+             name="responsibility-uuid"
+             key="responsibility-uuid"
+             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/@uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/rlink/@href"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/rlink/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="hash/@algorithm"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/base64/@filename"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/base64/@media-type"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/title"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1658,15 +1713,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/published"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1676,15 +1731,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/last-modified"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1694,15 +1749,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1712,15 +1767,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/oscal-version"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1730,8 +1785,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="title"/>
@@ -1757,14 +1812,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1772,15 +1827,15 @@
       </group>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1790,15 +1845,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision/published"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1808,15 +1863,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision/last-modified"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1826,15 +1881,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision/version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1844,15 +1899,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision/oscal-version"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1862,15 +1917,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/revisions/revision/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1880,13 +1935,13 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/document-id"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -1894,15 +1949,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1911,16 +1966,42 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="system-security-plan/metadata/role"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="@id"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:apply-templates select="description"/>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="system-security-plan/metadata/role/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1930,15 +2011,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/role/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1948,37 +2029,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/role/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/role/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1987,16 +2068,62 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="system-security-plan/metadata/location"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="title"/>
+         <xsl:apply-templates select="address"/>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="url" group-by="true()">
+            <group in-json="ARRAY" key="urls">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2006,8 +2133,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
@@ -2028,29 +2155,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address/addr-line"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address/city"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2060,15 +2187,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address/state"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2078,15 +2205,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address/postal-code"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2096,15 +2223,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/address/country"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2114,27 +2241,27 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -2142,29 +2269,30 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/url"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <value as-type="uri" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/location/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2173,16 +2301,84 @@
          </value>
       </field>
    </xsl:template>
+   <xsl:template match="system-security-plan/metadata/party"
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="@uuid"/>
+         <xsl:apply-templates select="@type"/>
+         <xsl:apply-templates select="name"/>
+         <xsl:apply-templates select="short-name"/>
+         <xsl:for-each-group select="external-id" group-by="true()">
+            <group in-json="ARRAY" key="external-ids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="prop" group-by="true()">
+            <group in-json="ARRAY" key="props">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="link" group-by="true()">
+            <group in-json="ARRAY" key="links">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="email-address" group-by="true()">
+            <group in-json="ARRAY" key="email-addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="telephone-number" group-by="true()">
+            <group in-json="ARRAY" key="telephone-numbers">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="address" group-by="true()">
+            <group in-json="ARRAY" key="addresses">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="location-uuid" group-by="true()">
+            <group in-json="ARRAY" key="location-uuids">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:for-each-group select="member-of-organization" group-by="true()">
+            <group in-json="ARRAY" key="member-of-organizations">
+               <xsl:apply-templates select="current-group()">
+                  <xsl:with-param name="with-key" select="false()"/>
+               </xsl:apply-templates>
+            </group>
+         </xsl:for-each-group>
+         <xsl:apply-templates select="remarks"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2192,15 +2388,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2210,13 +2406,13 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/external-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="id" in-json="string">
             <xsl:value-of select="."/>
@@ -2224,15 +2420,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2242,27 +2438,27 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/email-address"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <value as-type="email" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/telephone-number"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="@type"/>
          <value as-type="string" key="number" in-json="string">
             <xsl:value-of select="."/>
@@ -2270,8 +2466,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/address"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="address" gi="address">
          <xsl:apply-templates select="@type"/>
@@ -2289,29 +2485,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/address/addr-line"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/address/city"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2321,15 +2517,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/address/state"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2339,15 +2535,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/address/postal-code"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2357,15 +2553,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/address/country"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2375,29 +2571,65 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/party/member-of-organization"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <value as-type="uuid" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/metadata/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/action/link/text"
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+      <xsl:param name="with-key" select="true()"/>
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <value as-type="markup-line" in-json="string">
+            <xsl:apply-templates mode="cast-prose"/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="system-security-plan/metadata/action/responsible-party/link/text"
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2407,15 +2639,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-name"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-name"
-             key="system-name"
-             gi="system-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="system-name"
+              key="system-name"
+              gi="system-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-name</xsl:attribute>
          </xsl:if>
@@ -2425,15 +2657,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-name-short"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="system-name-short"
-             key="system-name-short"
-             gi="system-name-short"
-             in-json="SCALAR">
+              as-type="string"
+              name="system-name-short"
+              key="system-name-short"
+              gi="system-name-short"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-name-short</xsl:attribute>
          </xsl:if>
@@ -2443,37 +2675,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/description"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2483,15 +2715,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/date-authorized"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
@@ -2501,15 +2733,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/security-sensitivity-level"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-sensitivity-level"
-             key="security-sensitivity-level"
-             gi="security-sensitivity-level"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-sensitivity-level"
+              key="security-sensitivity-level"
+              gi="security-sensitivity-level"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-sensitivity-level</xsl:attribute>
          </xsl:if>
@@ -2519,15 +2751,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2537,8 +2769,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="information-type" gi="information-type">
          <xsl:apply-templates select="@uuid"/>
@@ -2571,15 +2803,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/title"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2589,30 +2821,30 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="categorization" gi="categorization">
          <xsl:apply-templates select="@system"/>
@@ -2626,29 +2858,29 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="information-type-id"
-             gi="information-type-id"
-             in-json="SCALAR">
+              as-type="string"
+              name="information-type-id"
+              gi="information-type-id"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2657,45 +2889,16 @@
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="confidentiality-impact"
-                key="confidentiality-impact"
-                gi="confidentiality-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="base"/>
-         <xsl:apply-templates select="selected"/>
-         <xsl:apply-templates select="adjustment-justification"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2705,15 +2908,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
@@ -2723,15 +2926,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
@@ -2741,66 +2944,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="integrity-impact"
-                key="integrity-impact"
-                gi="integrity-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">integrity-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="base"/>
-         <xsl:apply-templates select="selected"/>
-         <xsl:apply-templates select="adjustment-justification"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2810,15 +2984,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
@@ -2828,15 +3002,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
@@ -2846,66 +3020,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
-   <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
-      <xsl:param name="with-key" select="true()"/>
-      <assembly name="availability-impact"
-                key="availability-impact"
-                gi="availability-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">availability-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:for-each-group select="prop" group-by="true()">
-            <group in-json="ARRAY" key="props">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:for-each-group select="link" group-by="true()">
-            <group in-json="ARRAY" key="links">
-               <xsl:apply-templates select="current-group()">
-                  <xsl:with-param name="with-key" select="false()"/>
-               </xsl:apply-templates>
-            </group>
-         </xsl:for-each-group>
-         <xsl:apply-templates select="base"/>
-         <xsl:apply-templates select="selected"/>
-         <xsl:apply-templates select="adjustment-justification"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2915,15 +3060,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
@@ -2933,15 +3078,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
@@ -2951,37 +3096,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-confidentiality"
-             key="security-objective-confidentiality"
-             gi="security-objective-confidentiality"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-confidentiality"
+              key="security-objective-confidentiality"
+              gi="security-objective-confidentiality"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-confidentiality</xsl:attribute>
          </xsl:if>
@@ -2991,15 +3136,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-integrity"
-             key="security-objective-integrity"
-             gi="security-objective-integrity"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-integrity"
+              key="security-objective-integrity"
+              gi="security-objective-integrity"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-integrity</xsl:attribute>
          </xsl:if>
@@ -3009,15 +3154,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-availability"
-             key="security-objective-availability"
-             gi="security-objective-availability"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-availability"
+              key="security-objective-availability"
+              gi="security-objective-availability"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-availability</xsl:attribute>
          </xsl:if>
@@ -3027,8 +3172,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/status"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -3039,37 +3184,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3079,37 +3224,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3119,15 +3264,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
@@ -3137,37 +3282,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/network-architecture/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/network-architecture/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3177,37 +3322,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3217,15 +3362,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/network-architecture/diagram/caption"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
@@ -3235,37 +3380,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/data-flow/description"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/data-flow/link/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3275,37 +3420,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/description"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3315,15 +3460,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/data-flow/diagram/caption"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
@@ -3333,15 +3478,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-characteristics/responsible-party/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3351,15 +3496,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/link/text"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3369,8 +3514,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="leveraged-authorization" gi="leveraged-authorization">
          <xsl:apply-templates select="@uuid"/>
@@ -3395,15 +3540,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3413,15 +3558,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3431,15 +3576,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/party-uuid"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             key="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              key="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">party-uuid</xsl:attribute>
          </xsl:if>
@@ -3449,15 +3594,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/leveraged-authorization/date-authorized"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
@@ -3467,15 +3612,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3485,15 +3630,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/short-name"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -3503,37 +3648,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3543,15 +3688,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/authorized-privilege/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3561,37 +3706,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/user/authorized-privilege/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3601,37 +3746,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/purpose"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -3641,15 +3786,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3659,8 +3804,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/status"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
@@ -3671,15 +3816,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3689,15 +3834,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/component/protocol/title"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3707,37 +3852,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3747,15 +3892,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3765,8 +3910,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="@component-uuid"/>
@@ -3795,15 +3940,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3813,15 +3958,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3831,12 +3976,12 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation"
-                 priority="3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="control-implementation"
-                key="control-implementation"
-                gi="control-implementation">
+                 key="control-implementation"
+                 gi="control-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">control-implementation</xsl:attribute>
          </xsl:if>
@@ -3858,44 +4003,44 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/description"
-                 priority="4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/set-parameter/value"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="implemented-requirement" gi="implemented-requirement">
          <xsl:apply-templates select="@uuid"/>
@@ -3946,15 +4091,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/link/text"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3964,29 +4109,29 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3996,8 +4141,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="statement" gi="statement">
          <xsl:apply-templates select="@statement-id"/>
@@ -4034,15 +4179,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4052,15 +4197,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4070,37 +4215,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4110,22 +4255,22 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
@@ -4164,37 +4309,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4204,8 +4349,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
@@ -4235,37 +4380,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4275,15 +4420,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4293,8 +4438,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="@uuid"/>
@@ -4325,37 +4470,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4365,15 +4510,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text"
-                 priority="17"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="17"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4383,8 +4528,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
@@ -4414,37 +4559,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4454,15 +4599,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4472,8 +4617,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
@@ -4504,37 +4649,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4544,15 +4689,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text"
-                 priority="16"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="16"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4562,15 +4707,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4580,37 +4725,37 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/description"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4620,22 +4765,22 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <value as-type="string" in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export"
-                 priority="8"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="8"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
@@ -4674,37 +4819,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4714,8 +4859,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="provided" gi="provided">
          <xsl:apply-templates select="@uuid"/>
@@ -4745,37 +4890,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4785,15 +4930,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4803,8 +4948,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="responsibility" gi="responsibility">
          <xsl:apply-templates select="@uuid"/>
@@ -4835,37 +4980,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description"
-                 priority="11"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="11"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text"
-                 priority="13"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="13"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4875,15 +5020,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text"
-                 priority="15"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="15"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4893,8 +5038,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="inherited" gi="inherited">
          <xsl:apply-templates select="@uuid"/>
@@ -4924,37 +5069,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4964,15 +5109,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4982,8 +5127,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="satisfied" gi="satisfied">
          <xsl:apply-templates select="@uuid"/>
@@ -5014,37 +5159,37 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description"
-                 priority="10"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="10"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5054,15 +5199,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text"
-                 priority="14"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="14"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5072,15 +5217,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text"
-                 priority="12"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="12"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5090,8 +5235,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource"
-                 priority="5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="resource" gi="resource">
          <xsl:apply-templates select="@uuid"/>
@@ -5124,15 +5269,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/title"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5142,35 +5287,35 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/description"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <value as-type="markup-multiline" in-json="string">
             <xsl:for-each-group select="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                                group-by="true()">
+                                 group-by="true()">
                <xsl:apply-templates select="current-group()" mode="cast-prose"/>
             </xsl:for-each-group>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/document-id"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="@scheme"/>
          <value as-type="string" key="identifier" in-json="string">
             <xsl:value-of select="."/>
@@ -5178,8 +5323,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/citation"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
@@ -5203,15 +5348,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/citation/text"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5221,15 +5366,15 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/citation/link/text"
-                 priority="9"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="9"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5239,8 +5384,8 @@
       </field>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/rlink"
-                 priority="7"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="7"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <assembly name="rlink" gi="rlink">
          <xsl:apply-templates select="@href"/>
@@ -5255,14 +5400,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="system-security-plan/back-matter/resource/base64"
-                 priority="6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  priority="6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:param name="with-key" select="true()"/>
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -5274,10 +5419,10 @@
       </field>
    </xsl:template>
    <xsl:template match="*"
-                 mode="cast-prose"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
+                  mode="cast-prose"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/1.0">
       <xsl:element name="{ local-name() }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
@@ -5285,43 +5430,43 @@
    <!-- XML to JSON conversion: Supermodel serialization as JSON
         including markdown production -->
    <xsl:variable xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="ns"
-                 select="/*/@namespace"/>
+                  name="ns"
+                  select="/*/@namespace"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <array>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </array>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='BY_KEY']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='BY_KEY']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../@json-key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../@json-key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="group[@in-json='SINGLETON_OR_ARRAY'][count(*)=1]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="write-json">
          <xsl:with-param name="group-key" select="@key"/>
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="group/assembly | group/field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="group/assembly | group/field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- $group-key is only provided when group/@in-json="SINGLETON_OR_ASSEMBLY" and there is one member of the group -->
       <xsl:param name="group-key" select="()"/>
       <!--@json-key-flag is only available when group/@in-json="BY_KEY"-->
@@ -5339,10 +5484,10 @@
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="3"
-                 match="group/field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="3"
+                  match="group/field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:param name="group-key" select="()"/>
       <xsl:variable name="json-key-flag-name" select="@json-key-flag"/>
       <!-- with no flags, this field has only its value -->
@@ -5351,33 +5496,33 @@
       </xsl:apply-templates>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="/assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="/assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map>
          <xsl:next-match/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="assembly"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="assembly"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <map key="{@key}">
          <xsl:apply-templates mode="#current"/>
       </map>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="field[@in-json='SCALAR']"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="field[@in-json='SCALAR']"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="#current"/>
       <!--
         <!-\- when there are no flags, the field is a string whose value is the value -\->
@@ -5387,24 +5532,24 @@
         </string> -->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag[@key=../value/@key-flag]"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
+                  match="flag[@key=../value/@key-flag]"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"/>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="flag"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="flag"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:copy-of select="@key"/>
          <xsl:apply-templates mode="#current"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 priority="2"
-                 match="field[exists(@json-key-flag)]/value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  priority="2"
+                  match="field[exists(@json-key-flag)]/value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="../@json-key-flag"/>
       <xsl:element name="{@in-json}" namespace="http://www.w3.org/2005/xpath-functions">
          <xsl:attribute name="key" select="../flag[@key = $key-flag-name]"/>
@@ -5412,12 +5557,12 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value"
-                 mode="write-json"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value"
+                  mode="write-json"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="key-flag-name" select="@key-flag"/>
       <xsl:element name="{(@in-json[matches(.,'\S')],'string')[1]}"
-                   namespace="http://www.w3.org/2005/xpath-functions">
+                    namespace="http://www.w3.org/2005/xpath-functions">
             <!-- emit a key only if needed -->
          <xsl:copy-of select="((../flag[@key = $key-flag-name], parent::field[@in-json = 'SCALAR'])/@key, @key)[1]"/>
          <!-- overriding the key           -->
@@ -5430,46 +5575,46 @@
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="*"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="*"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:value-of select="."/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-line']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-line']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 match="value[@as-type='markup-multiline']"
-                 mode="cast-data"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="value[@as-type='markup-multiline']"
+                  mode="cast-data"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="lines" as="node()*">
          <xsl:apply-templates select="*" mode="md"/>
       </xsl:variable>
       <xsl:value-of select="$lines/self::* =&gt; string-join('&#xA;')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 name="conditional-lf"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  name="conditional-lf"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="exists(preceding-sibling::*)">
          <string/>
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()[empty(ancestor::pre)]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()[empty(ancestor::pre)]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:variable name="escaped">
          <xsl:value-of select="replace(., '([`~\^\*&#34;])', '\\$1')"/>
       </xsl:variable>
       <xsl:value-of select="replace($escaped,'\s+',' ')"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="text()"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="text()"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
         <!-- Escapes go here       -->
         <!-- prefixes ` ~ ^ * with char E0000 from Unicode PUA -->
         <!--<xsl:value-of select="replace(., '([`~\^\*''&quot;])', '&#xE0000;$1')"/>-->
@@ -5478,18 +5623,18 @@
       <!--<xsl:value-of select="."/>-->
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="p"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="p"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates mode="md"/>
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="h1 | h2 | h3 | h4 | h5 | h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="h1 | h2 | h3 | h4 | h5 | h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>
          <xsl:apply-templates select="." mode="mark"/>
@@ -5497,40 +5642,40 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h1"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
+                  mode="mark"
+                  match="h1"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"># </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h2"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
+                  mode="mark"
+                  match="h2"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">## </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h3"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
+                  mode="mark"
+                  match="h3"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h4"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
+                  mode="mark"
+                  match="h4"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">#### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h5"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
+                  mode="mark"
+                  match="h5"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">##### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="mark"
-                 match="h6"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
+                  mode="mark"
+                  match="h6"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">###### </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates select="*" mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="tr"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="tr"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:apply-templates select="*" mode="md"/>
       </string>
@@ -5544,19 +5689,19 @@
       </xsl:if>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="th | td"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="th | td"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:if test="empty(preceding-sibling::*)">|</xsl:if>
       <xsl:text> </xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text> |</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="pre"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="pre"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <string>```</string>
       <string>
@@ -5565,24 +5710,24 @@
       <string>```</string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 priority="1"
-                 match="ul | ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  priority="1"
+                  match="ul | ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:call-template name="conditional-lf"/>
       <xsl:apply-templates mode="md"/>
       <string/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ul//ul | ol//ol | ol//ul | ul//ol"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ul//ul | ol//ol | ol//ul | ul//ol"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates mode="md"/>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text>  </xsl:text>
@@ -5592,9 +5737,9 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="ol/li"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="ol/li"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <string>
          <xsl:for-each select="(../ancestor::ul | ../ancestor::ol)">
             <xsl:text xml:space="preserve">  </xsl:text>
@@ -5604,49 +5749,49 @@
       </string>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="code | span[contains(@class, 'code')]"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="code | span[contains(@class, 'code')]"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>`</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>`</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="em | i"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="em | i"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>*</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>*</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="strong | b"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="strong | b"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>**</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>**</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="q"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="q"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>"</xsl:text>
       <xsl:apply-templates mode="md"/>
       <xsl:text>"</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="insert"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="insert"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>{{ insert: </xsl:text>
       <xsl:value-of select="@type, @id-ref" separator=", "/>
       <xsl:text> }}</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="a"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="a"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>[</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>]</xsl:text>
@@ -5655,9 +5800,9 @@
       <xsl:text>)</xsl:text>
    </xsl:template>
    <xsl:template xmlns="http://www.w3.org/2005/xpath-functions"
-                 mode="md"
-                 match="img"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  mode="md"
+                  match="img"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:text>![</xsl:text>
       <xsl:value-of select="(@alt,@src)[1]"/>
       <xsl:text>]</xsl:text>
diff --git a/json/schema/oscal_assessment-plan_schema.json b/json/schema/oscal_assessment-plan_schema.json
index 9c0d31abd9..22d1e150b8 100644
--- a/json/schema/oscal_assessment-plan_schema.json
+++ b/json/schema/oscal_assessment-plan_schema.json
@@ -1,2898 +1,3014 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-ap-schema.json",
-    "$comment" : "OSCAL Assessment Plan Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-ap-schema.json",
+  "$comment" : "OSCAL Assessment Plan Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-ap-oscal-ap:assessment-plan" : 
+   { "title" : "Security Assessment Plan (SAP)",
+    "description" : "An assessment plan, such as those provided by a FedRAMP assessor.",
+    "$id" : "#assembly_oscal-ap_assessment-plan",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-ap-oscal-ap:assessment-plan" : 
-      { "title" : "Security Assessment Plan (SAP)",
-        "description" : "An assessment plan, such as those provided by a FedRAMP assessor.",
-        "$id" : "#assembly_oscal-ap_assessment-plan",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Plan Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" : 
-          { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "local-definitions" : 
-          { "title" : "Local Definitions",
-            "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
-            "type" : "object",
-            "properties" : 
-            { "components" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "objectives-and-methods" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "additionalProperties" : false },
-          "terms-and-conditions" : 
-          { "title" : "Assessment Plan Terms and Conditions",
-            "description" : "Used to define various terms and conditions under which an assessment, described by the plan, can be performed. Each child part defines a different type of term or condition.",
-            "type" : "object",
-            "properties" : 
-            { "parts" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
-            "additionalProperties" : false },
-          "reviewed-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "assessment-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "assessment-assets" : 
-          { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "import-ssp",
-          "reviewed-controls" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:revision" : 
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Plan Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-ssp" : 
+     { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
+     "local-definitions" : 
+     { "title" : "Local Definitions",
+      "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
+      "type" : "object",
+      "properties" : 
+      { "components" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+       "inventory-items" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+       "users" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
+       "objectives-and-methods" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
+       "activities" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_activity" } },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "additionalProperties" : false },
+     "terms-and-conditions" : 
+     { "title" : "Assessment Plan Terms and Conditions",
+      "description" : "Used to define various terms and conditions under which an assessment, described by the plan, can be performed. Each child part defines a different type of term or condition.",
+      "type" : "object",
+      "properties" : 
+      { "parts" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
+      "additionalProperties" : false },
+     "reviewed-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "assessment-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "assessment-assets" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "import-ssp",
+     "reviewed-controls" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:location" : 
-      { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-ap-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-ap-oscal-metadata:role" : 
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-ap-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
-          "media-type" : 
-          { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
-          "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-ap-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-ap-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-ap-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ap-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ap-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-ap-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-ap-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ap-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:import-ssp" : 
-      { "title" : "Import System Security Plan",
-        "description" : "Used by the assessment plan and POA&M to import information about the system.",
-        "$id" : "#assembly_oscal-assessment-common_import-ssp",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "System Security Plan Reference",
-            "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:local-objective" : 
-      { "title" : "Assessment-Specific Control Objective",
-        "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_local-objective",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "description" : 
-          { "title" : "Objective Description",
-            "description" : "A human-readable description of this control objective.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-id",
-          "parts" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-method" : 
-      { "title" : "Assessment Method",
-        "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-method",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Method Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Method Description",
-            "description" : "A human-readable description of this assessment method.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" : 
-          { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "part" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:activity" : 
-      { "title" : "Activity",
-        "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
-        "$id" : "#assembly_oscal-assessment-common_activity",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Activity Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Included Activity Title",
-            "description" : "The title for this included activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Included Activity Description",
-            "description" : "A human-readable description of this included activity.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Step",
-              "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Step Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Step Title",
-                  "description" : "The title for this step.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Step Description",
-                  "description" : "A human-readable description of this step.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" : 
-                { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "related-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:task" : 
-      { "title" : "Task",
-        "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_task",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Task Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Task Type",
-            "description" : "The type of task.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "milestone",
-                  "action" ] } ] },
-          "title" : 
-          { "title" : "Task Title",
-            "description" : "The title for this task.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Task Description",
-            "description" : "A human-readable description of this task.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" : 
-          { "title" : "Event Timing",
-            "description" : "The timing under which the task is intended to occur.",
-            "type" : "object",
-            "properties" : 
-            { "on-date" : 
-              { "title" : "On Date Condition",
-                "description" : "The task is intended to occur on the specified date.",
-                "type" : "object",
-                "properties" : 
-                { "date" : 
-                  { "title" : "On Date Condition",
-                    "description" : "The task must occur on the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "date" ],
-                "additionalProperties" : false },
-              "within-date-range" : 
-              { "title" : "On Date Range Condition",
-                "description" : "The task is intended to occur within the specified date range.",
-                "type" : "object",
-                "properties" : 
-                { "start" : 
-                  { "title" : "Start Date Condition",
-                    "description" : "The task must occur on or after the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                  "end" : 
-                  { "title" : "End Date Condition",
-                    "description" : "The task must occur on or before the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "start",
-                  "end" ],
-                "additionalProperties" : false },
-              "at-frequency" : 
-              { "title" : "Frequency Condition",
-                "description" : "The task is intended to occur at the specified frequency.",
-                "type" : "object",
-                "properties" : 
-                { "period" : 
-                  { "title" : "Period",
-                    "description" : "The task must occur after the specified period has elapsed.",
-                    "$ref" : "#/definitions/PositiveIntegerDatatype" },
-                  "unit" : 
-                  { "title" : "Time Unit",
-                    "description" : "The unit of time for the period.",
-                    "allOf" : 
-                    [ 
-                      { "$ref" : "#/definitions/StringDatatype" },
-                      
-                      { "enum" : 
-                        [ "seconds",
-                          "minutes",
-                          "hours",
-                          "days",
-                          "months",
-                          "years" ] } ] } },
-                "required" : 
-                [ "period",
-                  "unit" ],
-                "additionalProperties" : false } },
-            "additionalProperties" : false },
-          "dependencies" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Task Dependency",
-              "description" : "Used to indicate that a task is dependent on another task.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a unique task.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Activity",
-              "description" : "Identifies an individual activity to be performed as part of a task.",
-              "type" : "object",
-              "properties" : 
-              { "activity-uuid" : 
-                { "title" : "Activity Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "activity-uuid",
-                "subjects" ],
-              "additionalProperties" : false } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:reviewed-controls" : 
-      { "title" : "Reviewed Controls and Control Objectives",
-        "description" : "Identifies the controls being assessed and their control objectives.",
-        "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Control Objective Description",
-            "description" : "A human-readable description of control objectives.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessed Controls",
-              "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Assessed Controls Description",
-                  "description" : "A human-readable description of in-scope controls specified for assessment.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "control-objective-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Referenced Control Objectives",
-              "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Control Objectives Description",
-                  "description" : "A human-readable description of this collection of control objectives.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-selections" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:select-control-by-id" : 
-      { "title" : "Select Control",
-        "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
-        "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "statement-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Include Specific Statements",
-              "description" : "Used to constrain the selection to only specificity identified statements.",
-              "$ref" : "#/definitions/TokenDatatype" } } },
-        "required" : 
-        [ "control-id" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:select-objective-by-id" : 
-      { "title" : "Select Objective",
-        "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
-        "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
-        "type" : "object",
-        "properties" : 
-        { "objective-id" : 
-          { "title" : "Objective ID",
-            "description" : "Points to an assessment objective.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "objective-id" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-subject-placeholder" : 
-      { "title" : "Assessment Subject Placeholder",
-        "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Subject Placeholder Description",
-            "description" : "A human-readable description of intent of this assessment subject placeholder.",
-            "type" : "string" },
-          "sources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Subject Source",
-              "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "sources" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-subject" : 
-      { "title" : "Subject of Assessment",
-        "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Subject Type",
-            "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user" ] } ] },
-          "description" : 
-          { "title" : "Include Subjects Description",
-            "description" : "A human-readable description of the collection of subjects being included in this assessment.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:select-subject-by-id" : 
-      { "title" : "Select Assessment Subject",
-        "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
-        "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:subject-reference" : 
-      { "title" : "Identifies the Subject",
-        "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
-        "$id" : "#assembly_oscal-assessment-common_subject-reference",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "title" : 
-          { "title" : "Subject Reference Title",
-            "description" : "The title or name for the referenced subject.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-assets" : 
-      { "title" : "Assessment Assets",
-        "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-assets",
-        "type" : "object",
-        "properties" : 
-        { "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Platform",
-              "description" : "Used to represent the toolset used to perform aspects of the assessment.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Assessment Platform Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Assessment Platform Title",
-                  "description" : "The title or name for the assessment platform.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Uses Component",
-                    "description" : "The set of components that are used by the assessment platform.",
-                    "type" : "object",
-                    "properties" : 
-                    { "component-uuid" : 
-                      { "title" : "Component Universally Unique Identifier Reference",
-                        "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                        "$ref" : "#/definitions/UUIDDatatype" },
-                      "props" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" : 
-                      { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" : 
-                    [ "component-uuid" ],
-                    "additionalProperties" : false } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "assessment-platforms" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:finding-target" : 
-      { "title" : "Objective Status",
-        "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
-        "$id" : "#assembly_oscal-assessment-common_finding-target",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Finding Target Type",
-            "description" : "Identifies the type of the target.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "statement-id",
-                  "objective-id" ] } ] },
-          "target-id" : 
-          { "title" : "Finding Target Identifier Reference",
-            "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Objective Status Title",
-            "description" : "The title for this objective status.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Objective Status Description",
-            "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Objective Status",
-            "description" : "A determination of if the objective is satisfied or not within a given system.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "Objective Status State",
-                "description" : "An indication as to whether the objective is satisfied or not.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "satisfied",
-                      "not-satisfied" ] } ] },
-              "reason" : 
-              { "title" : "Objective Status Reason",
-                "description" : "The reason the objective was given it's status.",
-                "anyOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "pass",
-                      "fail",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "implementation-status" : 
-          { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type",
-          "target-id",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:observation" : 
-      { "title" : "Observation",
-        "description" : "Describes an individual observation.",
-        "$id" : "#assembly_oscal-assessment-common_observation",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Observation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Observation Title",
-            "description" : "The title for this observation.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Observation Description",
-            "description" : "A human-readable description of this assessment observation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Method",
-              "description" : "Identifies how the observation was made.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/StringDatatype" },
-                
-                { "enum" : 
-                  [ "EXAMINE",
-                    "INTERVIEW",
-                    "TEST",
-                    "UNKNOWN" ] } ] } },
-          "types" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Type",
-              "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/TokenDatatype" },
-                
-                { "enum" : 
-                  [ "ssp-statement-issue",
-                    "control-objective",
-                    "mitigation",
-                    "finding",
-                    "historic" ] } ] } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Relevant Evidence",
-              "description" : "Links this observation to relevant evidence.",
-              "type" : "object",
-              "properties" : 
-              { "href" : 
-                { "title" : "Relevant Evidence Reference",
-                  "description" : "A resolvable URL reference to relevant evidence.",
-                  "$ref" : "#/definitions/URIReferenceDatatype" },
-                "description" : 
-                { "title" : "Relevant Evidence Description",
-                  "description" : "A human-readable description of this evidence.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "description" ],
-              "additionalProperties" : false } },
-          "collected" : 
-          { "title" : "Collected Field",
-            "description" : "Date/time stamp identifying when the finding information was collected.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "expires" : 
-          { "title" : "Expires Field",
-            "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description",
-          "methods",
-          "collected" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:origin" : 
-      { "title" : "Origin",
-        "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
-        "$id" : "#assembly_oscal-assessment-common_origin",
-        "type" : "object",
-        "properties" : 
-        { "actors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" : 
-        [ "actors" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:origin-actor" : 
-      { "title" : "Originating Actor",
-        "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
-        "$id" : "#assembly_oscal-assessment-common_origin-actor",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Actor Type",
-            "description" : "The kind of actor.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "tool",
-                  "assessment-platform",
-                  "party" ] } ] },
-          "actor-uuid" : 
-          { "title" : "Actor Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "type",
-          "actor-uuid" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:related-task" : 
-      { "title" : "Task Reference",
-        "description" : "Identifies an individual task for which the containing object is a consequence of.",
-        "$id" : "#assembly_oscal-assessment-common_related-task",
-        "type" : "object",
-        "properties" : 
-        { "task-uuid" : 
-          { "title" : "Task Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a unique task.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" : 
-          { "title" : "Identified Subject",
-            "description" : "Used to detail assessment subjects that were identfied by this task.",
-            "type" : "object",
-            "properties" : 
-            { "subject-placeholder-uuid" : 
-              { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
-                "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
-                "$ref" : "#/definitions/UUIDDatatype" },
-              "subjects" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" : 
-            [ "subject-placeholder-uuid",
-              "subjects" ],
-            "additionalProperties" : false },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "task-uuid" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:threat-id" : 
-      { "title" : "Threat ID",
-        "description" : "A pointer, by ID, to an externally-defined threat.",
-        "$id" : "#field_oscal-assessment-common_threat-id",
-        "type" : "object",
-        "properties" : 
-        { "system" : 
-          { "title" : "Threat Type Identification System",
-            "description" : "Specifies the source of the threat information.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal" ] } ] },
-          "href" : 
-          { "title" : "Threat Information Resource Reference",
-            "description" : "An optional location for the threat data, from which this ID originates.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "id" : 
-          { "$ref" : "#/definitions/URIDatatype" } },
-        "required" : 
-        [ "id",
-          "system" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:risk" : 
-      { "title" : "Identified Risk",
-        "description" : "An identified risk.",
-        "$id" : "#assembly_oscal-assessment-common_risk",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Risk Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Risk Title",
-            "description" : "The title for this risk.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Risk Description",
-            "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
-            "type" : "string" },
-          "statement" : 
-          { "title" : "Risk Statement",
-            "description" : "An summary of impact for how the risk affects the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "$ref" : "#field_oscal-assessment-common_risk-status" },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Mitigating Factor",
-              "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Mitigating Factor Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "implementation-uuid" : 
-                { "title" : "Implementation UUID",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Mitigating Factor Description",
-                  "description" : "A human-readable description of this mitigating factor.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "deadline" : 
-          { "title" : "Risk Resolution Deadline",
-            "description" : "The date/time by which the risk must be resolved.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remediations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" : 
-          { "title" : "Risk Log",
-            "description" : "A log of all risk-related tasks taken.",
-            "type" : "object",
-            "properties" : 
-            { "entries" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Risk Log Entry",
-                  "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Risk Log Entry Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "title" : 
-                    { "title" : "Title",
-                      "description" : "The title for this risk log entry.",
-                      "type" : "string" },
-                    "description" : 
-                    { "title" : "Risk Task Description",
-                      "description" : "A human-readable description of what was done regarding the risk.",
-                      "type" : "string" },
-                    "start" : 
-                    { "title" : "Start",
-                      "description" : "Identifies the start date and time of the event.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "end" : 
-                    { "title" : "End",
-                      "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" : 
-                    { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "title" : "Risk Response Reference",
-                        "description" : "Identifies an individual risk response that this log entry is for.",
-                        "type" : "object",
-                        "properties" : 
-                        { "response-uuid" : 
-                          { "title" : "Response Universally Unique Identifier Reference",
-                            "description" : "A machine-oriented identifier reference to a unique risk response.",
-                            "$ref" : "#/definitions/UUIDDatatype" },
-                          "props" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" : 
-                          { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" : 
-                        [ "response-uuid" ],
-                        "additionalProperties" : false } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "start" ],
-                  "additionalProperties" : false } } },
-            "required" : 
-            [ "entries" ],
-            "additionalProperties" : false },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "statement",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:logged-by" : 
-      { "title" : "Logged By",
-        "description" : "Used to indicate who created a log entry in what role.",
-        "$id" : "#assembly_oscal-assessment-common_logged-by",
-        "type" : "object",
-        "properties" : 
-        { "party-uuid" : 
-          { "title" : "Party UUID Reference",
-            "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "A point to the role-id of the role in which the party is making the log entry.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "party-uuid" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:risk-status" : 
-      { "title" : "Risk Status",
-        "description" : "Describes the status of the associated risk.",
-        "$id" : "#field_oscal-assessment-common_risk-status",
-        "anyOf" : 
-        [ 
-          { "$ref" : "#/definitions/TokenDatatype" },
-          
-          { "enum" : 
-            [ "open",
-              "investigating",
-              "remediating",
-              "deviation-requested",
-              "deviation-approved",
-              "closed" ] } ] },
-      "oscal-ap-oscal-assessment-common:characterization" : 
-      { "title" : "Characterization",
-        "description" : "A collection of descriptive data about the containing object from a specific origin.",
-        "$id" : "#assembly_oscal-assessment-common_characterization",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" : 
-          { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Facet",
-              "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
-              "type" : "object",
-              "properties" : 
-              { "name" : 
-                { "title" : "Facet Name",
-                  "description" : "The name of the risk metric within the specified system.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "system" : 
-                { "title" : "Naming System",
-                  "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://fedramp.gov",
-                        "http://fedramp.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal/unknown",
-                        "http://cve.mitre.org",
-                        "http://www.first.org/cvss/v2.0",
-                        "http://www.first.org/cvss/v3.0",
-                        "http://www.first.org/cvss/v3.1" ] } ] },
-                "value" : 
-                { "title" : "Facet Value",
-                  "description" : "Indicates the value of the facet.",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "name",
-                "system",
-                "value" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "origin",
-          "facets" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:response" : 
-      { "title" : "Risk Response",
-        "description" : "Describes either recommended or an actual plan for addressing the risk.",
-        "$id" : "#assembly_oscal-assessment-common_response",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Remediation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "lifecycle" : 
-          { "title" : "Remediation Intent",
-            "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "recommendation",
-                  "planned",
-                  "completed" ] } ] },
-          "title" : 
-          { "title" : "Response Title",
-            "description" : "The title for this response activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Response Description",
-            "description" : "A human-readable description of this response plan.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Required Asset",
-              "description" : "Identifies an asset required to achieve remediation.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Required Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" : 
-                { "title" : "Title for Required Asset",
-                  "description" : "The title for this required asset.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Description of Required Asset",
-                  "description" : "A human-readable description of this required asset.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "lifecycle",
-          "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-assessment-common:assessment-part" : 
-      { "title" : "Assessment Part",
-        "description" : "A partition of an assessment plan or results or a child of another part.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-part",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Part Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "asset",
-                  "method",
-                  "objective" ] } ] },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ap-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-ap-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:system-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-implementation-common_system-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "this-system",
-                  "system",
-                  "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation",
-                  "network" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the system component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Status",
-            "description" : "Describes the operational status of the system component.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "State",
-                "description" : "The operational status.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "under-development",
-                      "operational",
-                      "disposition",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "responsible-roles" : 
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Location",
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
+            [ 
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-ap-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-ap-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-ap-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
+          "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
+          "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:protocol" : 
-      { "title" : "Service Protocol Information",
-        "description" : "Information about the protocol used to provide a service.",
-        "$id" : "#assembly_oscal-implementation-common_protocol",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
+            "$ref" : "#/definitions/URIReferenceDatatype" },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
+          "media-type" : 
+          { "title" : "Media Type",
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
+          "value" : 
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-ap-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-ap-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-ap-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ap-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ap-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-ap-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-ap-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ap-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:import-ssp" : 
+   { "title" : "Import System Security Plan",
+    "description" : "Used by the assessment plan and POA&M to import information about the system.",
+    "$id" : "#assembly_oscal-assessment-common_import-ssp",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "System Security Plan Reference",
+      "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:local-objective" : 
+   { "title" : "Assessment-Specific Control Objective",
+    "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_local-objective",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "description" : 
+     { "title" : "Objective Description",
+      "description" : "A human-readable description of this control objective.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-id",
+     "parts" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:assessment-method" : 
+   { "title" : "Assessment Method",
+    "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-method",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Method Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Method Description",
+      "description" : "A human-readable description of this assessment method.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "part" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "part" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:activity" : 
+   { "title" : "Activity",
+    "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
+    "$id" : "#assembly_oscal-assessment-common_activity",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Activity Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Included Activity Title",
+      "description" : "The title for this included activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Included Activity Description",
+      "description" : "A human-readable description of this included activity.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "steps" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Step",
+       "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Step Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Step Title",
+         "description" : "The title for this step.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Step Description",
+         "description" : "A human-readable description of this step.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "reviewed-controls" : 
+        { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "related-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:task" : 
+   { "title" : "Task",
+    "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_task",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Task Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Task Type",
+      "description" : "The type of task.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "milestone",
+         "action" ] } ] },
+     "title" : 
+     { "title" : "Task Title",
+      "description" : "The title for this task.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Task Description",
+      "description" : "A human-readable description of this task.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "timing" : 
+     { "title" : "Event Timing",
+      "description" : "The timing under which the task is intended to occur.",
+      "type" : "object",
+      "properties" : 
+      { "on-date" : 
+       { "title" : "On Date Condition",
+        "description" : "The task is intended to occur on the specified date.",
         "type" : "object",
         "properties" : 
-        { "uuid" : 
-          { "title" : "Service Protocol Information Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Protocol Name",
-            "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "title" : 
-          { "title" : "Protocol Title",
-            "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
-            "type" : "string" },
-          "port-ranges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+        { "date" : 
+         { "title" : "On Date Condition",
+          "description" : "The task must occur on the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "name" ],
+        [ "date" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:port-range" : 
-      { "title" : "Port Range",
-        "description" : "Where applicable this is the IPv4 port range on which the service operates.",
-        "$id" : "#assembly_oscal-implementation-common_port-range",
+       "within-date-range" : 
+       { "title" : "On Date Range Condition",
+        "description" : "The task is intended to occur within the specified date range.",
         "type" : "object",
         "properties" : 
         { "start" : 
-          { "title" : "Start",
-            "description" : "Indicates the starting port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "end" : 
-          { "title" : "End",
-            "description" : "Indicates the ending port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "transport" : 
-          { "title" : "Transport",
-            "description" : "Indicates the transport type.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "TCP",
-                  "UDP" ] } ] } },
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:implementation-status" : 
-      { "title" : "Implementation Status",
-        "description" : "Indicates the degree to which the a given control is implemented.",
-        "$id" : "#assembly_oscal-implementation-common_implementation-status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "Implementation State",
-            "description" : "Identifies the implementation status of the control or control objective.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "implemented",
-                  "partial",
-                  "planned",
-                  "alternative",
-                  "not-applicable" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
+         { "title" : "Start Date Condition",
+          "description" : "The task must occur on or after the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+         "end" : 
+         { "title" : "End Date Condition",
+          "description" : "The task must occur on or before the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "state" ],
+        [ "start",
+         "end" ],
         "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:system-user" : 
-      { "title" : "System User",
-        "description" : "A type of user that interacts with the system based on an associated role.",
-        "$id" : "#assembly_oscal-implementation-common_system-user",
+       "at-frequency" : 
+       { "title" : "Frequency Condition",
+        "description" : "The task is intended to occur at the specified frequency.",
         "type" : "object",
         "properties" : 
-        { "uuid" : 
-          { "title" : "User Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+        { "period" : 
+         { "title" : "Period",
+          "description" : "The task must occur after the specified period has elapsed.",
+          "$ref" : "#/definitions/PositiveIntegerDatatype" },
+         "unit" : 
+         { "title" : "Time Unit",
+          "description" : "The unit of time for the period.",
+          "allOf" : 
+          [ 
+           { "$ref" : "#/definitions/StringDatatype" },
+           
+           { "enum" : 
+            [ "seconds",
+             "minutes",
+             "hours",
+             "days",
+             "months",
+             "years" ] } ] } },
+        "required" : 
+        [ "period",
+         "unit" ],
+        "additionalProperties" : false } },
+      "additionalProperties" : false },
+     "dependencies" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Task Dependency",
+       "description" : "Used to indicate that a task is dependent on another task.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a unique task.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "associated-activities" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Activity",
+       "description" : "Identifies an individual activity to be performed as part of a task.",
+       "type" : "object",
+       "properties" : 
+       { "activity-uuid" : 
+        { "title" : "Activity Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "activity-uuid",
+        "subjects" ],
+       "additionalProperties" : false } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:reviewed-controls" : 
+   { "title" : "Reviewed Controls and Control Objectives",
+    "description" : "Identifies the controls being assessed and their control objectives.",
+    "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Control Objective Description",
+      "description" : "A human-readable description of control objectives.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "control-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessed Controls",
+       "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Assessed Controls Description",
+         "description" : "A human-readable description of in-scope controls specified for assessment.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "exclude-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "control-objective-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Referenced Control Objectives",
+       "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Control Objectives Description",
+         "description" : "A human-readable description of this collection of control objectives.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "exclude-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-selections" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:select-control-by-id" : 
+   { "title" : "Select Control",
+    "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
+    "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "statement-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Include Specific Statements",
+       "description" : "Used to constrain the selection to only specificity identified statements.",
+       "$ref" : "#/definitions/TokenDatatype" } } },
+    "required" : 
+    [ "control-id" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:select-objective-by-id" : 
+   { "title" : "Select Objective",
+    "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
+    "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
+    "type" : "object",
+    "properties" : 
+    { "objective-id" : 
+     { "title" : "Objective ID",
+      "description" : "Points to an assessment objective.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "objective-id" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:assessment-subject-placeholder" : 
+   { "title" : "Assessment Subject Placeholder",
+    "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Subject Placeholder Description",
+      "description" : "A human-readable description of intent of this assessment subject placeholder.",
+      "type" : "string" },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Subject Source",
+       "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "sources" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:assessment-subject" : 
+   { "title" : "Subject of Assessment",
+    "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user" ] } ] },
+     "description" : 
+     { "title" : "Include Subjects Description",
+      "description" : "A human-readable description of the collection of subjects being included in this assessment.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "exclude-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:select-subject-by-id" : 
+   { "title" : "Select Assessment Subject",
+    "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
+    "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:subject-reference" : 
+   { "title" : "Identifies the Subject",
+    "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
+    "$id" : "#assembly_oscal-assessment-common_subject-reference",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "title" : 
+     { "title" : "Subject Reference Title",
+      "description" : "The title or name for the referenced subject.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:assessment-assets" : 
+   { "title" : "Assessment Assets",
+    "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-assets",
+    "type" : "object",
+    "properties" : 
+    { "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "assessment-platforms" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Platform",
+       "description" : "Used to represent the toolset used to perform aspects of the assessment.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Assessment Platform Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Assessment Platform Title",
+         "description" : "The title or name for the assessment platform.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "uses-components" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Uses Component",
+          "description" : "The set of components that are used by the assessment platform.",
+          "type" : "object",
+          "properties" : 
+          { "component-uuid" : 
+           { "title" : "Component Universally Unique Identifier Reference",
+            "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
             "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "User Title",
-            "description" : "A name given to the user, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "User Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the user.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "User Description",
-            "description" : "A summary of the user's purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
+           "props" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
+           "links" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" : 
-          { "type" : "array",
+           "responsible-parties" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:authorized-privilege" : 
-      { "title" : "Privilege",
-        "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
-        "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Privilege Title",
-            "description" : "A human readable name for the privilege.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Privilege Description",
-            "description" : "A summary of the privilege's purpose within the system.",
-            "type" : "string" },
-          "functions-performed" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" : 
-        [ "title",
-          "functions-performed" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:function-performed" : 
-      { "title" : "Functions Performed",
-        "description" : "Describes a function performed for a given authorized privilege by this user class.",
-        "$id" : "#field_oscal-implementation-common_function-performed",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ap-oscal-implementation-common:inventory-item" : 
-      { "title" : "Inventory Item",
-        "description" : "A single managed inventory item within the system.",
-        "$id" : "#assembly_oscal-implementation-common_inventory-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Inventory Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
+            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+           "remarks" : 
+           { "$ref" : "#field_oscal-metadata_remarks" } },
+          "required" : 
+          [ "component-uuid" ],
+          "additionalProperties" : false } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "assessment-platforms" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:finding-target" : 
+   { "title" : "Objective Status",
+    "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
+    "$id" : "#assembly_oscal-assessment-common_finding-target",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Finding Target Type",
+      "description" : "Identifies the type of the target.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "statement-id",
+         "objective-id" ] } ] },
+     "target-id" : 
+     { "title" : "Finding Target Identifier Reference",
+      "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Objective Status Title",
+      "description" : "The title for this objective status.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Objective Status Description",
+      "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Objective Status",
+      "description" : "A determination of if the objective is satisfied or not within a given system.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "Objective Status State",
+        "description" : "An indication as to whether the objective is satisfied or not.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "satisfied",
+           "not-satisfied" ] } ] },
+       "reason" : 
+       { "title" : "Objective Status Reason",
+        "description" : "The reason the objective was given it's status.",
+        "anyOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "pass",
+           "fail",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "implementation-status" : 
+     { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "target-id",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:finding" : 
+   { "title" : "Finding",
+    "description" : "Describes an individual finding.",
+    "$id" : "#assembly_oscal-assessment-common_finding",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Finding Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Finding Title",
+      "description" : "The title for this finding.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Finding Description",
+      "description" : "A human-readable description of this finding.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "target" : 
+     { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
+     "implementation-statement-uuid" : 
+     { "title" : "Implementation Statement UUID",
+      "description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } },
+     "related-risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Risk",
+       "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "risk-uuid" : 
+        { "title" : "Risk Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "risk-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "target" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:observation" : 
+   { "title" : "Observation",
+    "description" : "Describes an individual observation.",
+    "$id" : "#assembly_oscal-assessment-common_observation",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Observation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Observation Title",
+      "description" : "The title for this observation.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Observation Description",
+      "description" : "A human-readable description of this assessment observation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "methods" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Method",
+       "description" : "Identifies how the observation was made.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/StringDatatype" },
+        
+        { "enum" : 
+         [ "EXAMINE",
+          "INTERVIEW",
+          "TEST",
+          "UNKNOWN" ] } ] } },
+     "types" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Type",
+       "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/TokenDatatype" },
+        
+        { "enum" : 
+         [ "ssp-statement-issue",
+          "control-objective",
+          "mitigation",
+          "finding",
+          "historic" ] } ] } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+     "relevant-evidence" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Relevant Evidence",
+       "description" : "Links this observation to relevant evidence.",
+       "type" : "object",
+       "properties" : 
+       { "href" : 
+        { "title" : "Relevant Evidence Reference",
+         "description" : "A resolvable URL reference to relevant evidence.",
+         "$ref" : "#/definitions/URIReferenceDatatype" },
+        "description" : 
+        { "title" : "Relevant Evidence Description",
+         "description" : "A human-readable description of this evidence.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "description" ],
+       "additionalProperties" : false } },
+     "collected" : 
+     { "title" : "Collected Field",
+      "description" : "Date/time stamp identifying when the finding information was collected.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "expires" : 
+     { "title" : "Expires Field",
+      "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description",
+     "methods",
+     "collected" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:origin" : 
+   { "title" : "Origin",
+    "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
+    "$id" : "#assembly_oscal-assessment-common_origin",
+    "type" : "object",
+    "properties" : 
+    { "actors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
+     "related-tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
+    "required" : 
+    [ "actors" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:origin-actor" : 
+   { "title" : "Originating Actor",
+    "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
+    "$id" : "#assembly_oscal-assessment-common_origin-actor",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Actor Type",
+      "description" : "The kind of actor.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "tool",
+         "assessment-platform",
+         "party" ] } ] },
+     "actor-uuid" : 
+     { "title" : "Actor Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "type",
+     "actor-uuid" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:related-task" : 
+   { "title" : "Task Reference",
+    "description" : "Identifies an individual task for which the containing object is a consequence of.",
+    "$id" : "#assembly_oscal-assessment-common_related-task",
+    "type" : "object",
+    "properties" : 
+    { "task-uuid" : 
+     { "title" : "Task Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a unique task.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "identified-subject" : 
+     { "title" : "Identified Subject",
+      "description" : "Used to detail assessment subjects that were identfied by this task.",
+      "type" : "object",
+      "properties" : 
+      { "subject-placeholder-uuid" : 
+       { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
+        "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
+        "$ref" : "#/definitions/UUIDDatatype" },
+       "subjects" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
+      "required" : 
+      [ "subject-placeholder-uuid",
+       "subjects" ],
+      "additionalProperties" : false },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "task-uuid" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:threat-id" : 
+   { "title" : "Threat ID",
+    "description" : "A pointer, by ID, to an externally-defined threat.",
+    "$id" : "#field_oscal-assessment-common_threat-id",
+    "type" : "object",
+    "properties" : 
+    { "system" : 
+     { "title" : "Threat Type Identification System",
+      "description" : "Specifies the source of the threat information.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://fedramp.gov",
+         "http://fedramp.gov/ns/oscal" ] } ] },
+     "href" : 
+     { "title" : "Threat Information Resource Reference",
+      "description" : "An optional location for the threat data, from which this ID originates.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "id" : 
+     { "$ref" : "#/definitions/URIDatatype" } },
+    "required" : 
+    [ "id",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:risk" : 
+   { "title" : "Identified Risk",
+    "description" : "An identified risk.",
+    "$id" : "#assembly_oscal-assessment-common_risk",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Risk Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Risk Title",
+      "description" : "The title for this risk.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Risk Description",
+      "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
+      "type" : "string" },
+     "statement" : 
+     { "title" : "Risk Statement",
+      "description" : "An summary of impact for how the risk affects the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "$ref" : "#field_oscal-assessment-common_risk-status" },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "threat-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-assessment-common_threat-id" } },
+     "characterizations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
+     "mitigating-factors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Mitigating Factor",
+       "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Mitigating Factor Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "implementation-uuid" : 
+        { "title" : "Implementation UUID",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Mitigating Factor Description",
+         "description" : "A human-readable description of this mitigating factor.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "deadline" : 
+     { "title" : "Risk Resolution Deadline",
+      "description" : "The date/time by which the risk must be resolved.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remediations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_response" } },
+     "risk-log" : 
+     { "title" : "Risk Log",
+      "description" : "A log of all risk-related tasks taken.",
+      "type" : "object",
+      "properties" : 
+      { "entries" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Risk Log Entry",
+         "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Risk Log Entry Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
+          "title" : 
+          { "title" : "Title",
+           "description" : "The title for this risk log entry.",
+           "type" : "string" },
           "description" : 
-          { "title" : "Inventory Item Description",
-            "description" : "A summary of the inventory item stating its purpose within the system.",
-            "type" : "string" },
+          { "title" : "Risk Task Description",
+           "description" : "A human-readable description of what was done regarding the risk.",
+           "type" : "string" },
+          "start" : 
+          { "title" : "Start",
+           "description" : "Identifies the start date and time of the event.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          "end" : 
+          { "title" : "End",
+           "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "logged-by" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Implemented Component",
-              "description" : "The set of components that are implemented in a given system inventory item.",
-              "type" : "object",
-              "properties" : 
-              { "component-uuid" : 
-                { "title" : "Component Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "component-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:set-parameter" : 
-      { "title" : "Set Parameter Value",
-        "description" : "Identifies the parameter that will be set by the enclosed value.",
-        "$id" : "#assembly_oscal-implementation-common_set-parameter",
-        "type" : "object",
-        "properties" : 
-        { "param-id" : 
-          { "title" : "Parameter ID",
-            "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "values" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
+          "status-change" : 
+          { "$ref" : "#field_oscal-assessment-common_risk-status" },
+          "related-responses" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Value",
-              "description" : "A parameter value or set of values.",
-              "$ref" : "#/definitions/StringDatatype" } },
+           "minItems" : 1,
+           "items" : 
+           { "title" : "Risk Response Reference",
+            "description" : "Identifies an individual risk response that this log entry is for.",
+            "type" : "object",
+            "properties" : 
+            { "response-uuid" : 
+             { "title" : "Response Universally Unique Identifier Reference",
+              "description" : "A machine-oriented identifier reference to a unique risk response.",
+              "$ref" : "#/definitions/UUIDDatatype" },
+             "props" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_property" } },
+             "links" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_link" } },
+             "related-tasks" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
+             "remarks" : 
+             { "$ref" : "#field_oscal-metadata_remarks" } },
+            "required" : 
+            [ "response-uuid" ],
+            "additionalProperties" : false } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "param-id",
-          "values" ],
-        "additionalProperties" : false },
-      "oscal-ap-oscal-implementation-common:system-id" : 
-      { "title" : "System Identification",
-        "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
-        "$id" : "#field_oscal-implementation-common_system-id",
-        "type" : "object",
-        "properties" : 
-        { "identifier-type" : 
-          { "title" : "Identification System Type",
-            "description" : "Identifies the identification system from which the provided identifier was assigned.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "https://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal",
-                  "https://ietf.org/rfc/rfc4122",
-                  "http://ietf.org/rfc/rfc4122" ] } ] },
-          "id" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "IntegerDatatype" : 
-      { "description" : "A whole number value.",
-        "type" : "integer" },
-      "NonNegativeIntegerDatatype" : 
-      { "description" : "An integer value that is equal to or greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
+         "required" : 
+         [ "uuid",
+          "start" ],
+         "additionalProperties" : false } } },
+      "required" : 
+      [ "entries" ],
+      "additionalProperties" : false },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "statement",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:logged-by" : 
+   { "title" : "Logged By",
+    "description" : "Used to indicate who created a log entry in what role.",
+    "$id" : "#assembly_oscal-assessment-common_logged-by",
+    "type" : "object",
+    "properties" : 
+    { "party-uuid" : 
+     { "title" : "Party UUID Reference",
+      "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "A point to the role-id of the role in which the party is making the log entry.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "party-uuid" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:risk-status" : 
+   { "title" : "Risk Status",
+    "description" : "Describes the status of the associated risk.",
+    "$id" : "#field_oscal-assessment-common_risk-status",
+    "anyOf" : 
+    [ 
+     { "$ref" : "#/definitions/TokenDatatype" },
+     
+     { "enum" : 
+      [ "open",
+       "investigating",
+       "remediating",
+       "deviation-requested",
+       "deviation-approved",
+       "closed" ] } ] },
+   "oscal-ap-oscal-assessment-common:characterization" : 
+   { "title" : "Characterization",
+    "description" : "A collection of descriptive data about the containing object from a specific origin.",
+    "$id" : "#assembly_oscal-assessment-common_characterization",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origin" : 
+     { "$ref" : "#assembly_oscal-assessment-common_origin" },
+     "facets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Facet",
+       "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
+       "type" : "object",
+       "properties" : 
+       { "name" : 
+        { "title" : "Facet Name",
+         "description" : "The name of the risk metric within the specified system.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "system" : 
+        { "title" : "Naming System",
+         "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
+         "anyOf" : 
+         [ 
+          { "$ref" : "#/definitions/URIDatatype" },
           
-          { "type" : "number",
-            "minimum" : 0 } ] },
-      "PositiveIntegerDatatype" : 
-      { "description" : "An integer value that is greater than 0.",
+          { "enum" : 
+           [ "http://fedramp.gov",
+            "http://fedramp.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal/unknown",
+            "http://cve.mitre.org",
+            "http://www.first.org/cvss/v2.0",
+            "http://www.first.org/cvss/v3.0",
+            "http://www.first.org/cvss/v3.1" ] } ] },
+        "value" : 
+        { "title" : "Facet Value",
+         "description" : "Indicates the value of the facet.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "name",
+        "system",
+        "value" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "origin",
+     "facets" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:response" : 
+   { "title" : "Risk Response",
+    "description" : "Describes either recommended or an actual plan for addressing the risk.",
+    "$id" : "#assembly_oscal-assessment-common_response",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Remediation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "lifecycle" : 
+     { "title" : "Remediation Intent",
+      "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "recommendation",
+         "planned",
+         "completed" ] } ] },
+     "title" : 
+     { "title" : "Response Title",
+      "description" : "The title for this response activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Response Description",
+      "description" : "A human-readable description of this response plan.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "required-assets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Required Asset",
+       "description" : "Identifies an asset required to achieve remediation.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Required Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+        "title" : 
+        { "title" : "Title for Required Asset",
+         "description" : "The title for this required asset.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Description of Required Asset",
+         "description" : "A human-readable description of this required asset.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "lifecycle",
+     "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-assessment-common:assessment-part" : 
+   { "title" : "Assessment Part",
+    "description" : "A partition of an assessment plan or results or a child of another part.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-part",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Part Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "asset",
+         "method",
+         "objective" ] } ] },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "A name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-ap-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ap-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-ap-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:system-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-implementation-common_system-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "this-system",
+         "system",
+         "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation",
+         "network" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the system component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Status",
+      "description" : "Describes the operational status of the system component.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "State",
+        "description" : "The operational status.",
         "allOf" : 
         [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 1 } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "under-development",
+           "operational",
+           "disposition",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:protocol" : 
+   { "title" : "Service Protocol Information",
+    "description" : "Information about the protocol used to provide a service.",
+    "$id" : "#assembly_oscal-implementation-common_protocol",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Service Protocol Information Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Protocol Name",
+      "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "title" : 
+     { "title" : "Protocol Title",
+      "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
+      "type" : "string" },
+     "port-ranges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:port-range" : 
+   { "title" : "Port Range",
+    "description" : "Where applicable this is the IPv4 port range on which the service operates.",
+    "$id" : "#assembly_oscal-implementation-common_port-range",
+    "type" : "object",
+    "properties" : 
+    { "start" : 
+     { "title" : "Start",
+      "description" : "Indicates the starting port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "end" : 
+     { "title" : "End",
+      "description" : "Indicates the ending port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "transport" : 
+     { "title" : "Transport",
+      "description" : "Indicates the transport type.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "TCP",
+         "UDP" ] } ] } },
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:implementation-status" : 
+   { "title" : "Implementation Status",
+    "description" : "Indicates the degree to which the a given control is implemented.",
+    "$id" : "#assembly_oscal-implementation-common_implementation-status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "Implementation State",
+      "description" : "Identifies the implementation status of the control or control objective.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "implemented",
+         "partial",
+         "planned",
+         "alternative",
+         "not-applicable" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:system-user" : 
+   { "title" : "System User",
+    "description" : "A type of user that interacts with the system based on an associated role.",
+    "$id" : "#assembly_oscal-implementation-common_system-user",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "User Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "User Title",
+      "description" : "A name given to the user, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "short-name" : 
+     { "title" : "User Short Name",
+      "description" : "A short common name, abbreviation, or acronym for the user.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "User Description",
+      "description" : "A summary of the user's purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "role-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_role-id" } },
+     "authorized-privileges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:authorized-privilege" : 
+   { "title" : "Privilege",
+    "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
+    "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Privilege Title",
+      "description" : "A human readable name for the privilege.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Privilege Description",
+      "description" : "A summary of the privilege's purpose within the system.",
+      "type" : "string" },
+     "functions-performed" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
+    "required" : 
+    [ "title",
+     "functions-performed" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:function-performed" : 
+   { "title" : "Functions Performed",
+    "description" : "Describes a function performed for a given authorized privilege by this user class.",
+    "$id" : "#field_oscal-implementation-common_function-performed",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ap-oscal-implementation-common:inventory-item" : 
+   { "title" : "Inventory Item",
+    "description" : "A single managed inventory item within the system.",
+    "$id" : "#assembly_oscal-implementation-common_inventory-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Inventory Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Inventory Item Description",
+      "description" : "A summary of the inventory item stating its purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "implemented-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Implemented Component",
+       "description" : "The set of components that are implemented in a given system inventory item.",
+       "type" : "object",
+       "properties" : 
+       { "component-uuid" : 
+        { "title" : "Component Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "component-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:set-parameter" : 
+   { "title" : "Set Parameter Value",
+    "description" : "Identifies the parameter that will be set by the enclosed value.",
+    "$id" : "#assembly_oscal-implementation-common_set-parameter",
+    "type" : "object",
+    "properties" : 
+    { "param-id" : 
+     { "title" : "Parameter ID",
+      "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Value",
+       "description" : "A parameter value or set of values.",
+       "$ref" : "#/definitions/StringDatatype" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "param-id",
+     "values" ],
+    "additionalProperties" : false },
+   "oscal-ap-oscal-implementation-common:system-id" : 
+   { "title" : "System Identification",
+    "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
+    "$id" : "#field_oscal-implementation-common_system-id",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "assessment-plan" : 
-      { "$ref" : "#assembly_oscal-ap_assessment-plan" } },
+    { "identifier-type" : 
+     { "title" : "Identification System Type",
+      "description" : "Identifies the identification system from which the provided identifier was assigned.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "https://fedramp.gov",
+         "http://fedramp.gov/ns/oscal",
+         "https://ietf.org/rfc/rfc4122",
+         "http://ietf.org/rfc/rfc4122" ] } ] },
+     "id" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
     "required" : 
-    [ "assessment-plan" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "id" ],
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "IntegerDatatype" : 
+   { "description" : "A whole number value.",
+    "type" : "integer" },
+   "NonNegativeIntegerDatatype" : 
+   { "description" : "An integer value that is equal to or greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 0 } ] },
+   "PositiveIntegerDatatype" : 
+   { "description" : "An integer value that is greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 1 } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "assessment-plan" : 
+   { "$ref" : "#assembly_oscal-ap_assessment-plan" } },
+  "required" : 
+  [ "assessment-plan" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_assessment-results_schema.json b/json/schema/oscal_assessment-results_schema.json
index 0656af5bcf..b91fa81f87 100644
--- a/json/schema/oscal_assessment-results_schema.json
+++ b/json/schema/oscal_assessment-results_schema.json
@@ -1,3128 +1,3167 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-ar-schema.json",
-    "$comment" : "OSCAL Assessment Results Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-ar-schema.json",
+  "$comment" : "OSCAL Assessment Results Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-ar-oscal-ar:assessment-results" : 
+   { "title" : "Security Assessment Results (SAR)",
+    "description" : "Security assessment results, such as those provided by a FedRAMP assessor in the FedRAMP Security Assessment Report.",
+    "$id" : "#assembly_oscal-ar_assessment-results",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-ar-oscal-ar:assessment-results" : 
-      { "title" : "Security Assessment Results (SAR)",
-        "description" : "Security assessment results, such as those provided by a FedRAMP assessor in the FedRAMP Security Assessment Report.",
-        "$id" : "#assembly_oscal-ar_assessment-results",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Results Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ap" : 
-          { "$ref" : "#assembly_oscal-ar_import-ap" },
-          "local-definitions" : 
-          { "title" : "Local Definitions",
-            "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
-            "type" : "object",
-            "properties" : 
-            { "objectives-and-methods" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "additionalProperties" : false },
-          "results" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ar_result" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "import-ap",
-          "results" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-ar:result" : 
-      { "title" : "Assessment Result",
-        "description" : "Used by the assessment results and POA&M. In the assessment results, this identifies all of the assessment observations and findings, initial and residual risks, deviations, and disposition. In the POA&M, this identifies initial and residual risks, deviations, and disposition.",
-        "$id" : "#assembly_oscal-ar_result",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Results Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Results Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-ap" : 
+     { "$ref" : "#assembly_oscal-ar_import-ap" },
+     "local-definitions" : 
+     { "title" : "Local Definitions",
+      "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
+      "type" : "object",
+      "properties" : 
+      { "objectives-and-methods" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
+       "activities" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_activity" } },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "additionalProperties" : false },
+     "results" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ar_result" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "import-ap",
+     "results" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-ar:result" : 
+   { "title" : "Assessment Result",
+    "description" : "Used by the assessment results and POA&M. In the assessment results, this identifies all of the assessment observations and findings, initial and residual risks, deviations, and disposition. In the POA&M, this identifies initial and residual risks, deviations, and disposition.",
+    "$id" : "#assembly_oscal-ar_result",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Results Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Results Title",
+      "description" : "The title for this set of results.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Results Description",
+      "description" : "A human-readable description of this set of test results.",
+      "type" : "string" },
+     "start" : 
+     { "title" : "start field",
+      "description" : "Date/time stamp identifying the start of the evidence collection reflected in these results.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "end" : 
+     { "title" : "end field",
+      "description" : "Date/time stamp identifying the end of the evidence collection reflected in these results. In a continuous motoring scenario, this may contain the same value as start if appropriate.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "local-definitions" : 
+     { "title" : "Local Definitions",
+      "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
+      "type" : "object",
+      "properties" : 
+      { "components" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+       "inventory-items" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+       "users" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
+       "assessment-assets" : 
+       { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
+       "tasks" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_task" } } },
+      "additionalProperties" : false },
+     "reviewed-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "attestations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Attestation Statements",
+       "description" : "A set of textual statements, typically written by the assessor.",
+       "type" : "object",
+       "properties" : 
+       { "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "parts" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
+       "required" : 
+       [ "parts" ],
+       "additionalProperties" : false } },
+     "assessment-log" : 
+     { "title" : "Assessment Log",
+      "description" : "A log of all assessment-related actions taken.",
+      "type" : "object",
+      "properties" : 
+      { "entries" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Assessment Log Entry",
+         "description" : "Identifies the result of an action and/or task that occurred as part of executing an assessment plan or an assessment event that occurred in producing the assessment results.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Assessment Log Entry Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "title" : 
-          { "title" : "Results Title",
-            "description" : "The title for this set of results.",
-            "type" : "string" },
+          { "title" : "Action Title",
+           "description" : "The title for this event.",
+           "type" : "string" },
           "description" : 
-          { "title" : "Results Description",
-            "description" : "A human-readable description of this set of test results.",
-            "type" : "string" },
+          { "title" : "Action Description",
+           "description" : "A human-readable description of this event.",
+           "type" : "string" },
           "start" : 
-          { "title" : "start field",
-            "description" : "Date/time stamp identifying the start of the evidence collection reflected in these results.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          { "title" : "Start",
+           "description" : "Identifies the start date and time of an event.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
           "end" : 
-          { "title" : "end field",
-            "description" : "Date/time stamp identifying the end of the evidence collection reflected in these results. In a continuous motoring scenario, this may contain the same value as start if appropriate.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          { "title" : "End",
+           "description" : "Identifies the end date and time of an event. If the event is a point in time, the start and end will be the same date and time.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "local-definitions" : 
-          { "title" : "Local Definitions",
-            "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
-            "type" : "object",
-            "properties" : 
-            { "components" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "assessment-assets" : 
-              { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-              "tasks" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_task" } } },
-            "additionalProperties" : false },
-          "reviewed-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "attestations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Attestation Statements",
-              "description" : "A set of textual statements, typically written by the assessor.",
-              "type" : "object",
-              "properties" : 
-              { "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "parts" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
-              "required" : 
-              [ "parts" ],
-              "additionalProperties" : false } },
-          "assessment-log" : 
-          { "title" : "Assessment Log",
-            "description" : "A log of all assessment-related actions taken.",
-            "type" : "object",
-            "properties" : 
-            { "entries" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Assessment Log Entry",
-                  "description" : "Identifies the result of an action and/or task that occurred as part of executing an assessment plan or an assessment event that occurred in producing the assessment results.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Assessment Log Entry Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "title" : 
-                    { "title" : "Action Title",
-                      "description" : "The title for this event.",
-                      "type" : "string" },
-                    "description" : 
-                    { "title" : "Action Description",
-                      "description" : "A human-readable description of this event.",
-                      "type" : "string" },
-                    "start" : 
-                    { "title" : "Start",
-                      "description" : "Identifies the start date and time of an event.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "end" : 
-                    { "title" : "End",
-                      "description" : "Identifies the end date and time of an event. If the event is a point in time, the start and end will be the same date and time.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "related-tasks" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "start" ],
-                  "additionalProperties" : false } } },
-            "required" : 
-            [ "entries" ],
-            "additionalProperties" : false },
-          "observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "logged-by" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "findings" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
+          "related-tasks" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ar_finding" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "start",
-          "reviewed-controls" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-ar:finding" : 
-      { "title" : "Finding",
-        "description" : "Describes an individual finding.",
-        "$id" : "#assembly_oscal-ar_finding",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Finding Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Finding Title",
-            "description" : "The title for this finding.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Finding Description",
-            "description" : "A human-readable description of this finding.",
-            "type" : "string" },
+         "required" : 
+         [ "uuid",
+          "start" ],
+         "additionalProperties" : false } } },
+      "required" : 
+      [ "entries" ],
+      "additionalProperties" : false },
+     "observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_observation" } },
+     "risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_risk" } },
+     "findings" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_finding" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "start",
+     "reviewed-controls" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-ar:import-ap" : 
+   { "title" : "Import Assessment Plan",
+    "description" : "Used by assessment-results to import information about the original plan for assessing the system.",
+    "$id" : "#assembly_oscal-ar_import-ap",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Assessment Plan Reference",
+      "description" : "A resolvable URL reference to the assessment plan governing the assessment activities.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Revision History Entry",
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Location",
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
+            [ 
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-ar-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-ar-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-ar-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "target" : 
-          { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
-          "implementation-statement-uuid" : 
-          { "title" : "Implementation Statement UUID",
-            "description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } },
-          "related-risks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Risk",
-              "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "risk-uuid" : 
-                { "title" : "Risk Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "risk-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
+            "$ref" : "#/definitions/URIReferenceDatatype" },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
+          "media-type" : 
+          { "title" : "Media Type",
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
+          "value" : 
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-ar-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-ar-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-ar-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ar-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ar-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-ar-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-ar-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ar-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:import-ssp" : 
+   { "title" : "Import System Security Plan",
+    "description" : "Used by the assessment plan and POA&M to import information about the system.",
+    "$id" : "#assembly_oscal-assessment-common_import-ssp",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "System Security Plan Reference",
+      "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:local-objective" : 
+   { "title" : "Assessment-Specific Control Objective",
+    "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_local-objective",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "description" : 
+     { "title" : "Objective Description",
+      "description" : "A human-readable description of this control objective.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-id",
+     "parts" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:assessment-method" : 
+   { "title" : "Assessment Method",
+    "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-method",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Method Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Method Description",
+      "description" : "A human-readable description of this assessment method.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "part" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "part" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:activity" : 
+   { "title" : "Activity",
+    "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
+    "$id" : "#assembly_oscal-assessment-common_activity",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Activity Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Included Activity Title",
+      "description" : "The title for this included activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Included Activity Description",
+      "description" : "A human-readable description of this included activity.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "steps" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Step",
+       "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Step Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Step Title",
+         "description" : "The title for this step.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Step Description",
+         "description" : "A human-readable description of this step.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "reviewed-controls" : 
+        { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "related-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:task" : 
+   { "title" : "Task",
+    "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_task",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Task Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Task Type",
+      "description" : "The type of task.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "milestone",
+         "action" ] } ] },
+     "title" : 
+     { "title" : "Task Title",
+      "description" : "The title for this task.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Task Description",
+      "description" : "A human-readable description of this task.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "timing" : 
+     { "title" : "Event Timing",
+      "description" : "The timing under which the task is intended to occur.",
+      "type" : "object",
+      "properties" : 
+      { "on-date" : 
+       { "title" : "On Date Condition",
+        "description" : "The task is intended to occur on the specified date.",
+        "type" : "object",
+        "properties" : 
+        { "date" : 
+         { "title" : "On Date Condition",
+          "description" : "The task must occur on the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "target" ],
+        [ "date" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-ar:import-ap" : 
-      { "title" : "Import Assessment Plan",
-        "description" : "Used by assessment-results to import information about the original plan for assessing the system.",
-        "$id" : "#assembly_oscal-ar_import-ap",
+       "within-date-range" : 
+       { "title" : "On Date Range Condition",
+        "description" : "The task is intended to occur within the specified date range.",
         "type" : "object",
         "properties" : 
-        { "href" : 
-          { "title" : "Assessment Plan Reference",
-            "description" : "A resolvable URL reference to the assessment plan governing the assessment activities.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
+        { "start" : 
+         { "title" : "Start Date Condition",
+          "description" : "The task must occur on or after the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+         "end" : 
+         { "title" : "End Date Condition",
+          "description" : "The task must occur on or before the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "href" ],
+        [ "start",
+         "end" ],
         "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
+       "at-frequency" : 
+       { "title" : "Frequency Condition",
+        "description" : "The task is intended to occur at the specified frequency.",
         "type" : "object",
         "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
+        { "period" : 
+         { "title" : "Period",
+          "description" : "The task must occur after the specified period has elapsed.",
+          "$ref" : "#/definitions/PositiveIntegerDatatype" },
+         "unit" : 
+         { "title" : "Time Unit",
+          "description" : "The unit of time for the period.",
+          "allOf" : 
+          [ 
+           { "$ref" : "#/definitions/StringDatatype" },
+           
+           { "enum" : 
+            [ "seconds",
+             "minutes",
+             "hours",
+             "days",
+             "months",
+             "years" ] } ] } },
+        "required" : 
+        [ "period",
+         "unit" ],
+        "additionalProperties" : false } },
+      "additionalProperties" : false },
+     "dependencies" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Task Dependency",
+       "description" : "Used to indicate that a task is dependent on another task.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a unique task.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "associated-activities" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Activity",
+       "description" : "Identifies an individual activity to be performed as part of a task.",
+       "type" : "object",
+       "properties" : 
+       { "activity-uuid" : 
+        { "title" : "Activity Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "activity-uuid",
+        "subjects" ],
+       "additionalProperties" : false } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:reviewed-controls" : 
+   { "title" : "Reviewed Controls and Control Objectives",
+    "description" : "Identifies the controls being assessed and their control objectives.",
+    "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Control Objective Description",
+      "description" : "A human-readable description of control objectives.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "control-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessed Controls",
+       "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Assessed Controls Description",
+         "description" : "A human-readable description of in-scope controls specified for assessment.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "exclude-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "control-objective-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Referenced Control Objectives",
+       "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Control Objectives Description",
+         "description" : "A human-readable description of this collection of control objectives.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "exclude-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-selections" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:select-control-by-id" : 
+   { "title" : "Select Control",
+    "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
+    "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "statement-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Include Specific Statements",
+       "description" : "Used to constrain the selection to only specificity identified statements.",
+       "$ref" : "#/definitions/TokenDatatype" } } },
+    "required" : 
+    [ "control-id" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:select-objective-by-id" : 
+   { "title" : "Select Objective",
+    "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
+    "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
+    "type" : "object",
+    "properties" : 
+    { "objective-id" : 
+     { "title" : "Objective ID",
+      "description" : "Points to an assessment objective.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "objective-id" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:assessment-subject-placeholder" : 
+   { "title" : "Assessment Subject Placeholder",
+    "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Subject Placeholder Description",
+      "description" : "A human-readable description of intent of this assessment subject placeholder.",
+      "type" : "string" },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Subject Source",
+       "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "sources" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:assessment-subject" : 
+   { "title" : "Subject of Assessment",
+    "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user" ] } ] },
+     "description" : 
+     { "title" : "Include Subjects Description",
+      "description" : "A human-readable description of the collection of subjects being included in this assessment.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "exclude-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:select-subject-by-id" : 
+   { "title" : "Select Assessment Subject",
+    "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
+    "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:subject-reference" : 
+   { "title" : "Identifies the Subject",
+    "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
+    "$id" : "#assembly_oscal-assessment-common_subject-reference",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "title" : 
+     { "title" : "Subject Reference Title",
+      "description" : "The title or name for the referenced subject.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:assessment-assets" : 
+   { "title" : "Assessment Assets",
+    "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-assets",
+    "type" : "object",
+    "properties" : 
+    { "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "assessment-platforms" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Platform",
+       "description" : "Used to represent the toolset used to perform aspects of the assessment.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Assessment Platform Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Assessment Platform Title",
+         "description" : "The title or name for the assessment platform.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "uses-components" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Uses Component",
+          "description" : "The set of components that are used by the assessment platform.",
+          "type" : "object",
+          "properties" : 
+          { "component-uuid" : 
+           { "title" : "Component Universally Unique Identifier Reference",
+            "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+            "$ref" : "#/definitions/UUIDDatatype" },
+           "props" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
+           "links" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
+           "responsible-parties" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:revision" : 
-      { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
+           "remarks" : 
+           { "$ref" : "#field_oscal-metadata_remarks" } },
+          "required" : 
+          [ "component-uuid" ],
+          "additionalProperties" : false } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "assessment-platforms" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:finding-target" : 
+   { "title" : "Objective Status",
+    "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
+    "$id" : "#assembly_oscal-assessment-common_finding-target",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Finding Target Type",
+      "description" : "Identifies the type of the target.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "statement-id",
+         "objective-id" ] } ] },
+     "target-id" : 
+     { "title" : "Finding Target Identifier Reference",
+      "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Objective Status Title",
+      "description" : "The title for this objective status.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Objective Status Description",
+      "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Objective Status",
+      "description" : "A determination of if the objective is satisfied or not within a given system.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "Objective Status State",
+        "description" : "An indication as to whether the objective is satisfied or not.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "satisfied",
+           "not-satisfied" ] } ] },
+       "reason" : 
+       { "title" : "Objective Status Reason",
+        "description" : "The reason the objective was given it's status.",
+        "anyOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "pass",
+           "fail",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "implementation-status" : 
+     { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "target-id",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:finding" : 
+   { "title" : "Finding",
+    "description" : "Describes an individual finding.",
+    "$id" : "#assembly_oscal-assessment-common_finding",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Finding Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Finding Title",
+      "description" : "The title for this finding.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Finding Description",
+      "description" : "A human-readable description of this finding.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "target" : 
+     { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
+     "implementation-statement-uuid" : 
+     { "title" : "Implementation Statement UUID",
+      "description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } },
+     "related-risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Risk",
+       "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "risk-uuid" : 
+        { "title" : "Risk Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "risk-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "target" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:observation" : 
+   { "title" : "Observation",
+    "description" : "Describes an individual observation.",
+    "$id" : "#assembly_oscal-assessment-common_observation",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Observation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Observation Title",
+      "description" : "The title for this observation.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Observation Description",
+      "description" : "A human-readable description of this assessment observation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "methods" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Method",
+       "description" : "Identifies how the observation was made.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/StringDatatype" },
+        
+        { "enum" : 
+         [ "EXAMINE",
+          "INTERVIEW",
+          "TEST",
+          "UNKNOWN" ] } ] } },
+     "types" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Type",
+       "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/TokenDatatype" },
+        
+        { "enum" : 
+         [ "ssp-statement-issue",
+          "control-objective",
+          "mitigation",
+          "finding",
+          "historic" ] } ] } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+     "relevant-evidence" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Relevant Evidence",
+       "description" : "Links this observation to relevant evidence.",
+       "type" : "object",
+       "properties" : 
+       { "href" : 
+        { "title" : "Relevant Evidence Reference",
+         "description" : "A resolvable URL reference to relevant evidence.",
+         "$ref" : "#/definitions/URIReferenceDatatype" },
+        "description" : 
+        { "title" : "Relevant Evidence Description",
+         "description" : "A human-readable description of this evidence.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "description" ],
+       "additionalProperties" : false } },
+     "collected" : 
+     { "title" : "Collected Field",
+      "description" : "Date/time stamp identifying when the finding information was collected.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "expires" : 
+     { "title" : "Expires Field",
+      "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description",
+     "methods",
+     "collected" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:origin" : 
+   { "title" : "Origin",
+    "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
+    "$id" : "#assembly_oscal-assessment-common_origin",
+    "type" : "object",
+    "properties" : 
+    { "actors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
+     "related-tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
+    "required" : 
+    [ "actors" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:origin-actor" : 
+   { "title" : "Originating Actor",
+    "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
+    "$id" : "#assembly_oscal-assessment-common_origin-actor",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Actor Type",
+      "description" : "The kind of actor.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "tool",
+         "assessment-platform",
+         "party" ] } ] },
+     "actor-uuid" : 
+     { "title" : "Actor Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "type",
+     "actor-uuid" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:related-task" : 
+   { "title" : "Task Reference",
+    "description" : "Identifies an individual task for which the containing object is a consequence of.",
+    "$id" : "#assembly_oscal-assessment-common_related-task",
+    "type" : "object",
+    "properties" : 
+    { "task-uuid" : 
+     { "title" : "Task Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a unique task.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "identified-subject" : 
+     { "title" : "Identified Subject",
+      "description" : "Used to detail assessment subjects that were identfied by this task.",
+      "type" : "object",
+      "properties" : 
+      { "subject-placeholder-uuid" : 
+       { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
+        "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
+        "$ref" : "#/definitions/UUIDDatatype" },
+       "subjects" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
+      "required" : 
+      [ "subject-placeholder-uuid",
+       "subjects" ],
+      "additionalProperties" : false },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "task-uuid" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:threat-id" : 
+   { "title" : "Threat ID",
+    "description" : "A pointer, by ID, to an externally-defined threat.",
+    "$id" : "#field_oscal-assessment-common_threat-id",
+    "type" : "object",
+    "properties" : 
+    { "system" : 
+     { "title" : "Threat Type Identification System",
+      "description" : "Specifies the source of the threat information.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://fedramp.gov",
+         "http://fedramp.gov/ns/oscal" ] } ] },
+     "href" : 
+     { "title" : "Threat Information Resource Reference",
+      "description" : "An optional location for the threat data, from which this ID originates.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "id" : 
+     { "$ref" : "#/definitions/URIDatatype" } },
+    "required" : 
+    [ "id",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:risk" : 
+   { "title" : "Identified Risk",
+    "description" : "An identified risk.",
+    "$id" : "#assembly_oscal-assessment-common_risk",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Risk Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Risk Title",
+      "description" : "The title for this risk.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Risk Description",
+      "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
+      "type" : "string" },
+     "statement" : 
+     { "title" : "Risk Statement",
+      "description" : "An summary of impact for how the risk affects the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "$ref" : "#field_oscal-assessment-common_risk-status" },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "threat-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-assessment-common_threat-id" } },
+     "characterizations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
+     "mitigating-factors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Mitigating Factor",
+       "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Mitigating Factor Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "implementation-uuid" : 
+        { "title" : "Implementation UUID",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Mitigating Factor Description",
+         "description" : "A human-readable description of this mitigating factor.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "deadline" : 
+     { "title" : "Risk Resolution Deadline",
+      "description" : "The date/time by which the risk must be resolved.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remediations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_response" } },
+     "risk-log" : 
+     { "title" : "Risk Log",
+      "description" : "A log of all risk-related tasks taken.",
+      "type" : "object",
+      "properties" : 
+      { "entries" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Risk Log Entry",
+         "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Risk Log Entry Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
+          "title" : 
+          { "title" : "Title",
+           "description" : "The title for this risk log entry.",
+           "type" : "string" },
+          "description" : 
+          { "title" : "Risk Task Description",
+           "description" : "A human-readable description of what was done regarding the risk.",
+           "type" : "string" },
+          "start" : 
+          { "title" : "Start",
+           "description" : "Identifies the start date and time of the event.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          "end" : 
+          { "title" : "End",
+           "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:location" : 
-      { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "logged-by" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
+          "status-change" : 
+          { "$ref" : "#field_oscal-assessment-common_risk-status" },
+          "related-responses" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-ar-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-ar-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-ar-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
-          "media-type" : 
-          { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
-          "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-ar-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-ar-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-ar-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ar-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ar-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-ar-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-ar-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ar-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:import-ssp" : 
-      { "title" : "Import System Security Plan",
-        "description" : "Used by the assessment plan and POA&M to import information about the system.",
-        "$id" : "#assembly_oscal-assessment-common_import-ssp",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "System Security Plan Reference",
-            "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:local-objective" : 
-      { "title" : "Assessment-Specific Control Objective",
-        "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_local-objective",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "description" : 
-          { "title" : "Objective Description",
-            "description" : "A human-readable description of this control objective.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-id",
-          "parts" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-method" : 
-      { "title" : "Assessment Method",
-        "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-method",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Method Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Method Description",
-            "description" : "A human-readable description of this assessment method.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" : 
-          { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "part" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:activity" : 
-      { "title" : "Activity",
-        "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
-        "$id" : "#assembly_oscal-assessment-common_activity",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Activity Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Included Activity Title",
-            "description" : "The title for this included activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Included Activity Description",
-            "description" : "A human-readable description of this included activity.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Step",
-              "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Step Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Step Title",
-                  "description" : "The title for this step.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Step Description",
-                  "description" : "A human-readable description of this step.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" : 
-                { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "related-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:task" : 
-      { "title" : "Task",
-        "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_task",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Task Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Task Type",
-            "description" : "The type of task.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "milestone",
-                  "action" ] } ] },
-          "title" : 
-          { "title" : "Task Title",
-            "description" : "The title for this task.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Task Description",
-            "description" : "A human-readable description of this task.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" : 
-          { "title" : "Event Timing",
-            "description" : "The timing under which the task is intended to occur.",
-            "type" : "object",
-            "properties" : 
-            { "on-date" : 
-              { "title" : "On Date Condition",
-                "description" : "The task is intended to occur on the specified date.",
-                "type" : "object",
-                "properties" : 
-                { "date" : 
-                  { "title" : "On Date Condition",
-                    "description" : "The task must occur on the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "date" ],
-                "additionalProperties" : false },
-              "within-date-range" : 
-              { "title" : "On Date Range Condition",
-                "description" : "The task is intended to occur within the specified date range.",
-                "type" : "object",
-                "properties" : 
-                { "start" : 
-                  { "title" : "Start Date Condition",
-                    "description" : "The task must occur on or after the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                  "end" : 
-                  { "title" : "End Date Condition",
-                    "description" : "The task must occur on or before the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "start",
-                  "end" ],
-                "additionalProperties" : false },
-              "at-frequency" : 
-              { "title" : "Frequency Condition",
-                "description" : "The task is intended to occur at the specified frequency.",
-                "type" : "object",
-                "properties" : 
-                { "period" : 
-                  { "title" : "Period",
-                    "description" : "The task must occur after the specified period has elapsed.",
-                    "$ref" : "#/definitions/PositiveIntegerDatatype" },
-                  "unit" : 
-                  { "title" : "Time Unit",
-                    "description" : "The unit of time for the period.",
-                    "allOf" : 
-                    [ 
-                      { "$ref" : "#/definitions/StringDatatype" },
-                      
-                      { "enum" : 
-                        [ "seconds",
-                          "minutes",
-                          "hours",
-                          "days",
-                          "months",
-                          "years" ] } ] } },
-                "required" : 
-                [ "period",
-                  "unit" ],
-                "additionalProperties" : false } },
-            "additionalProperties" : false },
-          "dependencies" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Task Dependency",
-              "description" : "Used to indicate that a task is dependent on another task.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a unique task.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Activity",
-              "description" : "Identifies an individual activity to be performed as part of a task.",
-              "type" : "object",
-              "properties" : 
-              { "activity-uuid" : 
-                { "title" : "Activity Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "activity-uuid",
-                "subjects" ],
-              "additionalProperties" : false } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:reviewed-controls" : 
-      { "title" : "Reviewed Controls and Control Objectives",
-        "description" : "Identifies the controls being assessed and their control objectives.",
-        "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Control Objective Description",
-            "description" : "A human-readable description of control objectives.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessed Controls",
-              "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Assessed Controls Description",
-                  "description" : "A human-readable description of in-scope controls specified for assessment.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "control-objective-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Referenced Control Objectives",
-              "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Control Objectives Description",
-                  "description" : "A human-readable description of this collection of control objectives.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-selections" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:select-control-by-id" : 
-      { "title" : "Select Control",
-        "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
-        "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "statement-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Include Specific Statements",
-              "description" : "Used to constrain the selection to only specificity identified statements.",
-              "$ref" : "#/definitions/TokenDatatype" } } },
-        "required" : 
-        [ "control-id" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:select-objective-by-id" : 
-      { "title" : "Select Objective",
-        "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
-        "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
-        "type" : "object",
-        "properties" : 
-        { "objective-id" : 
-          { "title" : "Objective ID",
-            "description" : "Points to an assessment objective.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "objective-id" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-subject-placeholder" : 
-      { "title" : "Assessment Subject Placeholder",
-        "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Subject Placeholder Description",
-            "description" : "A human-readable description of intent of this assessment subject placeholder.",
-            "type" : "string" },
-          "sources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Subject Source",
-              "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "sources" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-subject" : 
-      { "title" : "Subject of Assessment",
-        "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Subject Type",
-            "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user" ] } ] },
-          "description" : 
-          { "title" : "Include Subjects Description",
-            "description" : "A human-readable description of the collection of subjects being included in this assessment.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:select-subject-by-id" : 
-      { "title" : "Select Assessment Subject",
-        "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
-        "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:subject-reference" : 
-      { "title" : "Identifies the Subject",
-        "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
-        "$id" : "#assembly_oscal-assessment-common_subject-reference",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "title" : 
-          { "title" : "Subject Reference Title",
-            "description" : "The title or name for the referenced subject.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-assets" : 
-      { "title" : "Assessment Assets",
-        "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-assets",
-        "type" : "object",
-        "properties" : 
-        { "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Platform",
-              "description" : "Used to represent the toolset used to perform aspects of the assessment.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Assessment Platform Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Assessment Platform Title",
-                  "description" : "The title or name for the assessment platform.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Uses Component",
-                    "description" : "The set of components that are used by the assessment platform.",
-                    "type" : "object",
-                    "properties" : 
-                    { "component-uuid" : 
-                      { "title" : "Component Universally Unique Identifier Reference",
-                        "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                        "$ref" : "#/definitions/UUIDDatatype" },
-                      "props" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" : 
-                      { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" : 
-                    [ "component-uuid" ],
-                    "additionalProperties" : false } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "assessment-platforms" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:finding-target" : 
-      { "title" : "Objective Status",
-        "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
-        "$id" : "#assembly_oscal-assessment-common_finding-target",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Finding Target Type",
-            "description" : "Identifies the type of the target.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "statement-id",
-                  "objective-id" ] } ] },
-          "target-id" : 
-          { "title" : "Finding Target Identifier Reference",
-            "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Objective Status Title",
-            "description" : "The title for this objective status.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Objective Status Description",
-            "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Objective Status",
-            "description" : "A determination of if the objective is satisfied or not within a given system.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "Objective Status State",
-                "description" : "An indication as to whether the objective is satisfied or not.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "satisfied",
-                      "not-satisfied" ] } ] },
-              "reason" : 
-              { "title" : "Objective Status Reason",
-                "description" : "The reason the objective was given it's status.",
-                "anyOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "pass",
-                      "fail",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "implementation-status" : 
-          { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type",
-          "target-id",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:observation" : 
-      { "title" : "Observation",
-        "description" : "Describes an individual observation.",
-        "$id" : "#assembly_oscal-assessment-common_observation",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Observation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Observation Title",
-            "description" : "The title for this observation.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Observation Description",
-            "description" : "A human-readable description of this assessment observation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Method",
-              "description" : "Identifies how the observation was made.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/StringDatatype" },
-                
-                { "enum" : 
-                  [ "EXAMINE",
-                    "INTERVIEW",
-                    "TEST",
-                    "UNKNOWN" ] } ] } },
-          "types" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Type",
-              "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/TokenDatatype" },
-                
-                { "enum" : 
-                  [ "ssp-statement-issue",
-                    "control-objective",
-                    "mitigation",
-                    "finding",
-                    "historic" ] } ] } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Relevant Evidence",
-              "description" : "Links this observation to relevant evidence.",
-              "type" : "object",
-              "properties" : 
-              { "href" : 
-                { "title" : "Relevant Evidence Reference",
-                  "description" : "A resolvable URL reference to relevant evidence.",
-                  "$ref" : "#/definitions/URIReferenceDatatype" },
-                "description" : 
-                { "title" : "Relevant Evidence Description",
-                  "description" : "A human-readable description of this evidence.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "description" ],
-              "additionalProperties" : false } },
-          "collected" : 
-          { "title" : "Collected Field",
-            "description" : "Date/time stamp identifying when the finding information was collected.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "expires" : 
-          { "title" : "Expires Field",
-            "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description",
-          "methods",
-          "collected" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:origin" : 
-      { "title" : "Origin",
-        "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
-        "$id" : "#assembly_oscal-assessment-common_origin",
-        "type" : "object",
-        "properties" : 
-        { "actors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" : 
-        [ "actors" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:origin-actor" : 
-      { "title" : "Originating Actor",
-        "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
-        "$id" : "#assembly_oscal-assessment-common_origin-actor",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Actor Type",
-            "description" : "The kind of actor.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "tool",
-                  "assessment-platform",
-                  "party" ] } ] },
-          "actor-uuid" : 
-          { "title" : "Actor Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "type",
-          "actor-uuid" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:related-task" : 
-      { "title" : "Task Reference",
-        "description" : "Identifies an individual task for which the containing object is a consequence of.",
-        "$id" : "#assembly_oscal-assessment-common_related-task",
-        "type" : "object",
-        "properties" : 
-        { "task-uuid" : 
-          { "title" : "Task Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a unique task.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" : 
-          { "title" : "Identified Subject",
-            "description" : "Used to detail assessment subjects that were identfied by this task.",
-            "type" : "object",
-            "properties" : 
-            { "subject-placeholder-uuid" : 
-              { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
-                "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
-                "$ref" : "#/definitions/UUIDDatatype" },
-              "subjects" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" : 
-            [ "subject-placeholder-uuid",
-              "subjects" ],
-            "additionalProperties" : false },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "task-uuid" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:threat-id" : 
-      { "title" : "Threat ID",
-        "description" : "A pointer, by ID, to an externally-defined threat.",
-        "$id" : "#field_oscal-assessment-common_threat-id",
-        "type" : "object",
-        "properties" : 
-        { "system" : 
-          { "title" : "Threat Type Identification System",
-            "description" : "Specifies the source of the threat information.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal" ] } ] },
-          "href" : 
-          { "title" : "Threat Information Resource Reference",
-            "description" : "An optional location for the threat data, from which this ID originates.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "id" : 
-          { "$ref" : "#/definitions/URIDatatype" } },
-        "required" : 
-        [ "id",
-          "system" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:risk" : 
-      { "title" : "Identified Risk",
-        "description" : "An identified risk.",
-        "$id" : "#assembly_oscal-assessment-common_risk",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Risk Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Risk Title",
-            "description" : "The title for this risk.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Risk Description",
-            "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
-            "type" : "string" },
-          "statement" : 
-          { "title" : "Risk Statement",
-            "description" : "An summary of impact for how the risk affects the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "$ref" : "#field_oscal-assessment-common_risk-status" },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Mitigating Factor",
-              "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Mitigating Factor Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "implementation-uuid" : 
-                { "title" : "Implementation UUID",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Mitigating Factor Description",
-                  "description" : "A human-readable description of this mitigating factor.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "deadline" : 
-          { "title" : "Risk Resolution Deadline",
-            "description" : "The date/time by which the risk must be resolved.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remediations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" : 
-          { "title" : "Risk Log",
-            "description" : "A log of all risk-related tasks taken.",
-            "type" : "object",
-            "properties" : 
-            { "entries" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Risk Log Entry",
-                  "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Risk Log Entry Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "title" : 
-                    { "title" : "Title",
-                      "description" : "The title for this risk log entry.",
-                      "type" : "string" },
-                    "description" : 
-                    { "title" : "Risk Task Description",
-                      "description" : "A human-readable description of what was done regarding the risk.",
-                      "type" : "string" },
-                    "start" : 
-                    { "title" : "Start",
-                      "description" : "Identifies the start date and time of the event.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "end" : 
-                    { "title" : "End",
-                      "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" : 
-                    { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "title" : "Risk Response Reference",
-                        "description" : "Identifies an individual risk response that this log entry is for.",
-                        "type" : "object",
-                        "properties" : 
-                        { "response-uuid" : 
-                          { "title" : "Response Universally Unique Identifier Reference",
-                            "description" : "A machine-oriented identifier reference to a unique risk response.",
-                            "$ref" : "#/definitions/UUIDDatatype" },
-                          "props" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" : 
-                          { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" : 
-                        [ "response-uuid" ],
-                        "additionalProperties" : false } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "start" ],
-                  "additionalProperties" : false } } },
-            "required" : 
-            [ "entries" ],
-            "additionalProperties" : false },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "statement",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:logged-by" : 
-      { "title" : "Logged By",
-        "description" : "Used to indicate who created a log entry in what role.",
-        "$id" : "#assembly_oscal-assessment-common_logged-by",
-        "type" : "object",
-        "properties" : 
-        { "party-uuid" : 
-          { "title" : "Party UUID Reference",
-            "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "A point to the role-id of the role in which the party is making the log entry.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "party-uuid" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:risk-status" : 
-      { "title" : "Risk Status",
-        "description" : "Describes the status of the associated risk.",
-        "$id" : "#field_oscal-assessment-common_risk-status",
-        "anyOf" : 
-        [ 
-          { "$ref" : "#/definitions/TokenDatatype" },
-          
-          { "enum" : 
-            [ "open",
-              "investigating",
-              "remediating",
-              "deviation-requested",
-              "deviation-approved",
-              "closed" ] } ] },
-      "oscal-ar-oscal-assessment-common:characterization" : 
-      { "title" : "Characterization",
-        "description" : "A collection of descriptive data about the containing object from a specific origin.",
-        "$id" : "#assembly_oscal-assessment-common_characterization",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" : 
-          { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Facet",
-              "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
-              "type" : "object",
-              "properties" : 
-              { "name" : 
-                { "title" : "Facet Name",
-                  "description" : "The name of the risk metric within the specified system.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "system" : 
-                { "title" : "Naming System",
-                  "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://fedramp.gov",
-                        "http://fedramp.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal/unknown",
-                        "http://cve.mitre.org",
-                        "http://www.first.org/cvss/v2.0",
-                        "http://www.first.org/cvss/v3.0",
-                        "http://www.first.org/cvss/v3.1" ] } ] },
-                "value" : 
-                { "title" : "Facet Value",
-                  "description" : "Indicates the value of the facet.",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "name",
-                "system",
-                "value" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "origin",
-          "facets" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:response" : 
-      { "title" : "Risk Response",
-        "description" : "Describes either recommended or an actual plan for addressing the risk.",
-        "$id" : "#assembly_oscal-assessment-common_response",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Remediation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "lifecycle" : 
-          { "title" : "Remediation Intent",
-            "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "recommendation",
-                  "planned",
-                  "completed" ] } ] },
-          "title" : 
-          { "title" : "Response Title",
-            "description" : "The title for this response activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Response Description",
-            "description" : "A human-readable description of this response plan.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Required Asset",
-              "description" : "Identifies an asset required to achieve remediation.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Required Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" : 
-                { "title" : "Title for Required Asset",
-                  "description" : "The title for this required asset.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Description of Required Asset",
-                  "description" : "A human-readable description of this required asset.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "lifecycle",
-          "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-assessment-common:assessment-part" : 
-      { "title" : "Assessment Part",
-        "description" : "A partition of an assessment plan or results or a child of another part.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-part",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Part Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "asset",
-                  "method",
-                  "objective" ] } ] },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ar-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-ar-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:system-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-implementation-common_system-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "this-system",
-                  "system",
-                  "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation",
-                  "network" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the system component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Status",
-            "description" : "Describes the operational status of the system component.",
+           "minItems" : 1,
+           "items" : 
+           { "title" : "Risk Response Reference",
+            "description" : "Identifies an individual risk response that this log entry is for.",
             "type" : "object",
             "properties" : 
-            { "state" : 
-              { "title" : "State",
-                "description" : "The operational status.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "under-development",
-                      "operational",
-                      "disposition",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
+            { "response-uuid" : 
+             { "title" : "Response Universally Unique Identifier Reference",
+              "description" : "A machine-oriented identifier reference to a unique risk response.",
+              "$ref" : "#/definitions/UUIDDatatype" },
+             "props" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_property" } },
+             "links" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_link" } },
+             "related-tasks" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
+             "remarks" : 
+             { "$ref" : "#field_oscal-metadata_remarks" } },
             "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:protocol" : 
-      { "title" : "Service Protocol Information",
-        "description" : "Information about the protocol used to provide a service.",
-        "$id" : "#assembly_oscal-implementation-common_protocol",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Service Protocol Information Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Protocol Name",
-            "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "title" : 
-          { "title" : "Protocol Title",
-            "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
-            "type" : "string" },
-          "port-ranges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:port-range" : 
-      { "title" : "Port Range",
-        "description" : "Where applicable this is the IPv4 port range on which the service operates.",
-        "$id" : "#assembly_oscal-implementation-common_port-range",
-        "type" : "object",
-        "properties" : 
-        { "start" : 
-          { "title" : "Start",
-            "description" : "Indicates the starting port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "end" : 
-          { "title" : "End",
-            "description" : "Indicates the ending port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "transport" : 
-          { "title" : "Transport",
-            "description" : "Indicates the transport type.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "TCP",
-                  "UDP" ] } ] } },
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:implementation-status" : 
-      { "title" : "Implementation Status",
-        "description" : "Indicates the degree to which the a given control is implemented.",
-        "$id" : "#assembly_oscal-implementation-common_implementation-status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "Implementation State",
-            "description" : "Identifies the implementation status of the control or control objective.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "implemented",
-                  "partial",
-                  "planned",
-                  "alternative",
-                  "not-applicable" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:system-user" : 
-      { "title" : "System User",
-        "description" : "A type of user that interacts with the system based on an associated role.",
-        "$id" : "#assembly_oscal-implementation-common_system-user",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "User Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "User Title",
-            "description" : "A name given to the user, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "User Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the user.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "User Description",
-            "description" : "A summary of the user's purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:authorized-privilege" : 
-      { "title" : "Privilege",
-        "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
-        "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Privilege Title",
-            "description" : "A human readable name for the privilege.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Privilege Description",
-            "description" : "A summary of the privilege's purpose within the system.",
-            "type" : "string" },
-          "functions-performed" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" : 
-        [ "title",
-          "functions-performed" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:function-performed" : 
-      { "title" : "Functions Performed",
-        "description" : "Describes a function performed for a given authorized privilege by this user class.",
-        "$id" : "#field_oscal-implementation-common_function-performed",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ar-oscal-implementation-common:inventory-item" : 
-      { "title" : "Inventory Item",
-        "description" : "A single managed inventory item within the system.",
-        "$id" : "#assembly_oscal-implementation-common_inventory-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Inventory Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Inventory Item Description",
-            "description" : "A summary of the inventory item stating its purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Implemented Component",
-              "description" : "The set of components that are implemented in a given system inventory item.",
-              "type" : "object",
-              "properties" : 
-              { "component-uuid" : 
-                { "title" : "Component Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "component-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:set-parameter" : 
-      { "title" : "Set Parameter Value",
-        "description" : "Identifies the parameter that will be set by the enclosed value.",
-        "$id" : "#assembly_oscal-implementation-common_set-parameter",
-        "type" : "object",
-        "properties" : 
-        { "param-id" : 
-          { "title" : "Parameter ID",
-            "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Value",
-              "description" : "A parameter value or set of values.",
-              "$ref" : "#/definitions/StringDatatype" } },
+            [ "response-uuid" ],
+            "additionalProperties" : false } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "param-id",
-          "values" ],
-        "additionalProperties" : false },
-      "oscal-ar-oscal-implementation-common:system-id" : 
-      { "title" : "System Identification",
-        "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
-        "$id" : "#field_oscal-implementation-common_system-id",
-        "type" : "object",
-        "properties" : 
-        { "identifier-type" : 
-          { "title" : "Identification System Type",
-            "description" : "Identifies the identification system from which the provided identifier was assigned.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "https://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal",
-                  "https://ietf.org/rfc/rfc4122",
-                  "http://ietf.org/rfc/rfc4122" ] } ] },
-          "id" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "IntegerDatatype" : 
-      { "description" : "A whole number value.",
-        "type" : "integer" },
-      "NonNegativeIntegerDatatype" : 
-      { "description" : "An integer value that is equal to or greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
+         "required" : 
+         [ "uuid",
+          "start" ],
+         "additionalProperties" : false } } },
+      "required" : 
+      [ "entries" ],
+      "additionalProperties" : false },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "statement",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:logged-by" : 
+   { "title" : "Logged By",
+    "description" : "Used to indicate who created a log entry in what role.",
+    "$id" : "#assembly_oscal-assessment-common_logged-by",
+    "type" : "object",
+    "properties" : 
+    { "party-uuid" : 
+     { "title" : "Party UUID Reference",
+      "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "A point to the role-id of the role in which the party is making the log entry.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "party-uuid" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:risk-status" : 
+   { "title" : "Risk Status",
+    "description" : "Describes the status of the associated risk.",
+    "$id" : "#field_oscal-assessment-common_risk-status",
+    "anyOf" : 
+    [ 
+     { "$ref" : "#/definitions/TokenDatatype" },
+     
+     { "enum" : 
+      [ "open",
+       "investigating",
+       "remediating",
+       "deviation-requested",
+       "deviation-approved",
+       "closed" ] } ] },
+   "oscal-ar-oscal-assessment-common:characterization" : 
+   { "title" : "Characterization",
+    "description" : "A collection of descriptive data about the containing object from a specific origin.",
+    "$id" : "#assembly_oscal-assessment-common_characterization",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origin" : 
+     { "$ref" : "#assembly_oscal-assessment-common_origin" },
+     "facets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Facet",
+       "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
+       "type" : "object",
+       "properties" : 
+       { "name" : 
+        { "title" : "Facet Name",
+         "description" : "The name of the risk metric within the specified system.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "system" : 
+        { "title" : "Naming System",
+         "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
+         "anyOf" : 
+         [ 
+          { "$ref" : "#/definitions/URIDatatype" },
           
-          { "type" : "number",
-            "minimum" : 0 } ] },
-      "PositiveIntegerDatatype" : 
-      { "description" : "An integer value that is greater than 0.",
+          { "enum" : 
+           [ "http://fedramp.gov",
+            "http://fedramp.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal/unknown",
+            "http://cve.mitre.org",
+            "http://www.first.org/cvss/v2.0",
+            "http://www.first.org/cvss/v3.0",
+            "http://www.first.org/cvss/v3.1" ] } ] },
+        "value" : 
+        { "title" : "Facet Value",
+         "description" : "Indicates the value of the facet.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "name",
+        "system",
+        "value" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "origin",
+     "facets" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:response" : 
+   { "title" : "Risk Response",
+    "description" : "Describes either recommended or an actual plan for addressing the risk.",
+    "$id" : "#assembly_oscal-assessment-common_response",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Remediation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "lifecycle" : 
+     { "title" : "Remediation Intent",
+      "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "recommendation",
+         "planned",
+         "completed" ] } ] },
+     "title" : 
+     { "title" : "Response Title",
+      "description" : "The title for this response activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Response Description",
+      "description" : "A human-readable description of this response plan.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "required-assets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Required Asset",
+       "description" : "Identifies an asset required to achieve remediation.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Required Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+        "title" : 
+        { "title" : "Title for Required Asset",
+         "description" : "The title for this required asset.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Description of Required Asset",
+         "description" : "A human-readable description of this required asset.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "lifecycle",
+     "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-assessment-common:assessment-part" : 
+   { "title" : "Assessment Part",
+    "description" : "A partition of an assessment plan or results or a child of another part.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-part",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Part Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "asset",
+         "method",
+         "objective" ] } ] },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "A name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-ar-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ar-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-ar-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:system-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-implementation-common_system-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "this-system",
+         "system",
+         "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation",
+         "network" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the system component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Status",
+      "description" : "Describes the operational status of the system component.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "State",
+        "description" : "The operational status.",
         "allOf" : 
         [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 1 } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "under-development",
+           "operational",
+           "disposition",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:protocol" : 
+   { "title" : "Service Protocol Information",
+    "description" : "Information about the protocol used to provide a service.",
+    "$id" : "#assembly_oscal-implementation-common_protocol",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Service Protocol Information Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Protocol Name",
+      "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "title" : 
+     { "title" : "Protocol Title",
+      "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
+      "type" : "string" },
+     "port-ranges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:port-range" : 
+   { "title" : "Port Range",
+    "description" : "Where applicable this is the IPv4 port range on which the service operates.",
+    "$id" : "#assembly_oscal-implementation-common_port-range",
+    "type" : "object",
+    "properties" : 
+    { "start" : 
+     { "title" : "Start",
+      "description" : "Indicates the starting port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "end" : 
+     { "title" : "End",
+      "description" : "Indicates the ending port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "transport" : 
+     { "title" : "Transport",
+      "description" : "Indicates the transport type.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "TCP",
+         "UDP" ] } ] } },
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:implementation-status" : 
+   { "title" : "Implementation Status",
+    "description" : "Indicates the degree to which the a given control is implemented.",
+    "$id" : "#assembly_oscal-implementation-common_implementation-status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "Implementation State",
+      "description" : "Identifies the implementation status of the control or control objective.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "implemented",
+         "partial",
+         "planned",
+         "alternative",
+         "not-applicable" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:system-user" : 
+   { "title" : "System User",
+    "description" : "A type of user that interacts with the system based on an associated role.",
+    "$id" : "#assembly_oscal-implementation-common_system-user",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "User Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "User Title",
+      "description" : "A name given to the user, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "short-name" : 
+     { "title" : "User Short Name",
+      "description" : "A short common name, abbreviation, or acronym for the user.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "User Description",
+      "description" : "A summary of the user's purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "role-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_role-id" } },
+     "authorized-privileges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:authorized-privilege" : 
+   { "title" : "Privilege",
+    "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
+    "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Privilege Title",
+      "description" : "A human readable name for the privilege.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Privilege Description",
+      "description" : "A summary of the privilege's purpose within the system.",
+      "type" : "string" },
+     "functions-performed" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
+    "required" : 
+    [ "title",
+     "functions-performed" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:function-performed" : 
+   { "title" : "Functions Performed",
+    "description" : "Describes a function performed for a given authorized privilege by this user class.",
+    "$id" : "#field_oscal-implementation-common_function-performed",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ar-oscal-implementation-common:inventory-item" : 
+   { "title" : "Inventory Item",
+    "description" : "A single managed inventory item within the system.",
+    "$id" : "#assembly_oscal-implementation-common_inventory-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Inventory Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Inventory Item Description",
+      "description" : "A summary of the inventory item stating its purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "implemented-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Implemented Component",
+       "description" : "The set of components that are implemented in a given system inventory item.",
+       "type" : "object",
+       "properties" : 
+       { "component-uuid" : 
+        { "title" : "Component Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "component-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:set-parameter" : 
+   { "title" : "Set Parameter Value",
+    "description" : "Identifies the parameter that will be set by the enclosed value.",
+    "$id" : "#assembly_oscal-implementation-common_set-parameter",
+    "type" : "object",
+    "properties" : 
+    { "param-id" : 
+     { "title" : "Parameter ID",
+      "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Value",
+       "description" : "A parameter value or set of values.",
+       "$ref" : "#/definitions/StringDatatype" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "param-id",
+     "values" ],
+    "additionalProperties" : false },
+   "oscal-ar-oscal-implementation-common:system-id" : 
+   { "title" : "System Identification",
+    "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
+    "$id" : "#field_oscal-implementation-common_system-id",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "assessment-results" : 
-      { "$ref" : "#assembly_oscal-ar_assessment-results" } },
+    { "identifier-type" : 
+     { "title" : "Identification System Type",
+      "description" : "Identifies the identification system from which the provided identifier was assigned.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "https://fedramp.gov",
+         "http://fedramp.gov/ns/oscal",
+         "https://ietf.org/rfc/rfc4122",
+         "http://ietf.org/rfc/rfc4122" ] } ] },
+     "id" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
     "required" : 
-    [ "assessment-results" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "id" ],
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "IntegerDatatype" : 
+   { "description" : "A whole number value.",
+    "type" : "integer" },
+   "NonNegativeIntegerDatatype" : 
+   { "description" : "An integer value that is equal to or greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 0 } ] },
+   "PositiveIntegerDatatype" : 
+   { "description" : "An integer value that is greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 1 } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "assessment-results" : 
+   { "$ref" : "#assembly_oscal-ar_assessment-results" } },
+  "required" : 
+  [ "assessment-results" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_catalog_schema.json b/json/schema/oscal_catalog_schema.json
index d145139aed..601864f221 100644
--- a/json/schema/oscal_catalog_schema.json
+++ b/json/schema/oscal_catalog_schema.json
@@ -1,1044 +1,1227 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-catalog-schema.json",
-    "$comment" : "OSCAL Control Catalog Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-catalog-schema.json",
+  "$comment" : "OSCAL Control Catalog Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-catalog-oscal-catalog:catalog" : 
+   { "title" : "Catalog",
+    "description" : "A structured, organized collection of control information.",
+    "$id" : "#assembly_oscal-catalog_catalog",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-catalog-oscal-catalog:catalog" : 
-      { "title" : "Catalog",
-        "description" : "A collection of controls.",
-        "$id" : "#assembly_oscal-catalog_catalog",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Catalog Universally Unique Identifier",
-            "description" : "A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_control" } },
-          "groups" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_group" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog:group" : 
-      { "title" : "Control Group",
-        "description" : "A group of controls, or of groups of controls.",
-        "$id" : "#assembly_oscal-catalog_group",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Group Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Group Class",
-            "description" : "A textual label that provides a sub-type or characterization of the group.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Group Title",
-            "description" : "A name given to the group, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "groups" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_group" } },
-          "controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_control" } } },
-        "required" : 
-        [ "title" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog:control" : 
-      { "title" : "Control",
-        "description" : "A structured information object representing a security or privacy control. Each security or privacy control within the Catalog is defined by a distinct control instance.",
-        "$id" : "#assembly_oscal-catalog_control",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Control Identifier",
-            "description" : "A human-oriented, locally unique identifier with instance scope that can be used to reference this control elsewhere in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same control across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Control Class",
-            "description" : "A textual label that provides a sub-type or characterization of the control.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Control Title",
-            "description" : "A name given to the control, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_control" } } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-catalog-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:revision" : 
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Catalog Universally Unique Identifier",
+      "description" : "Provides a globally unique means to identify a given catalog instance.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_control" } },
+     "groups" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_group" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-catalog:group" : 
+   { "title" : "Control Group",
+    "description" : "A group of controls, or of groups of controls.",
+    "$id" : "#assembly_oscal-catalog_group",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Group Identifier",
+      "description" : "Identifies the group for the purpose of cross-linking within the defining instance or from other instances that reference the catalog.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Group Class",
+      "description" : "A textual label that provides a sub-type or characterization of the group.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Group Title",
+      "description" : "A name given to the group, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "groups" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_group" } },
+     "controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_control" } } },
+    "required" : 
+    [ "title" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-catalog:control" : 
+   { "title" : "Control",
+    "description" : "A structured object representing a requirement or guideline, which when implemented will reduce an aspect of risk related to an information system and its information.",
+    "$id" : "#assembly_oscal-catalog_control",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Control Identifier",
+      "description" : "Identifies a control such that it can be referenced in the defining catalog and other OSCAL instances (e.g., profiles).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Control Class",
+      "description" : "A textual label that provides a sub-type or characterization of the control.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Control Title",
+      "description" : "A name given to the control, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "mapping" : 
+     { "title" : "Mapping",
+      "description" : "A mapping between the containing control and another resource.",
+      "type" : "object",
+      "properties" : 
+      { "uuid" : 
+       { "title" : "Mapping Identifier",
+        "description" : "The unique identifier for the mapping.",
+        "$ref" : "#/definitions/UUIDDatatype" },
+       "target-resource" : 
+       { "$ref" : "#assembly_oscal-mapping-common_mapping-resource-reference" },
+       "maps" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-mapping-common_map" } } },
+      "required" : 
+      [ "uuid",
+       "target-resource",
+       "maps" ],
+      "additionalProperties" : false },
+     "controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_control" } } },
+    "required" : 
+    [ "id",
+     "title" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-catalog-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:location" : 
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-catalog-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
             [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-catalog-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-catalog-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-catalog-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-catalog-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
+            "$ref" : "#/definitions/URIReferenceDatatype" },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
             "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
+           "hashes" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-catalog-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
           "media-type" : 
           { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
           "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-catalog-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-catalog-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-catalog-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-catalog-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-catalog-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-catalog-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-catalog-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-catalog-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-catalog-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-catalog-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-catalog-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-catalog-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-catalog-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-catalog-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-catalog-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-mapping-common:map" : 
+   { "title" : "Mapping Entry",
+    "description" : "A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.",
+    "$id" : "#assembly_oscal-mapping-common_map",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Entry Identifier",
+      "description" : "The unique identifier for the mapping entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "relationship" : 
+     { "title" : "Mapping Entry Relationship",
+      "description" : "The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.",
+      "type" : "object",
+      "properties" : 
+      { "ns" : 
+       { "title" : "Relationship Value Namespace",
+        "description" : "A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.",
+        "$ref" : "#/definitions/URIDatatype" },
+       "type" : 
+       { "$ref" : "#/definitions/TokenDatatype" } },
+      "required" : 
+      [ "type" ],
+      "additionalProperties" : false },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_mapping-item" } },
+     "targets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_mapping-item" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "relationship",
+     "sources",
+     "targets" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-mapping-common:mapping-item" : 
+   { "title" : "Mapping Entry Item (source or target)",
+    "description" : "Identifies a specific edge within a source or target that is the subject of a mapping.",
+    "$id" : "#assembly_oscal-mapping-common_mapping-item",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "The semantic type of the subject.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "control",
+         "statement" ] } ] },
+     "id-ref" : 
+     { "title" : "Subject Identifier Reference",
+      "description" : "A reference to an identified subject that is of the specified type.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "id-ref" ],
+    "additionalProperties" : false },
+   "oscal-catalog-oscal-mapping-common:mapping-resource-reference" : 
+   { "title" : "Mapped Resource Reference",
+    "description" : "A reference to a resource that is either the source or target of a mapping.",
+    "$id" : "#assembly_oscal-mapping-common_mapping-resource-reference",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "catalog" : 
-      { "$ref" : "#assembly_oscal-catalog_catalog" } },
+    { "type" : 
+     { "title" : "Resource Type",
+      "description" : "The semantic type of the resource.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "catalog" ] } ] },
+     "href" : 
+     { "title" : "Catalog or Profile Reference",
+      "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
     "required" : 
-    [ "catalog" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "type",
+     "href" ],
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "catalog" : 
+   { "$ref" : "#assembly_oscal-catalog_catalog" } },
+  "required" : 
+  [ "catalog" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_complete_schema.json b/json/schema/oscal_complete_schema.json
index baa8ac509b..aa9d0f10b6 100644
--- a/json/schema/oscal_complete_schema.json
+++ b/json/schema/oscal_complete_schema.json
@@ -1,5121 +1,5351 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0/1.0.6/oscal-complete-schema.json",
-    "$comment" : "OSCAL Unified Model of Models: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0/1.0.6/oscal-complete-schema.json",
+  "$comment" : "OSCAL Unified Model of Models: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-complete-oscal-catalog:catalog" : 
+   { "title" : "Catalog",
+    "description" : "A structured, organized collection of control information.",
+    "$id" : "#assembly_oscal-catalog_catalog",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-complete-oscal-catalog:catalog" : 
-      { "title" : "Catalog",
-        "description" : "A collection of controls.",
-        "$id" : "#assembly_oscal-catalog_catalog",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Catalog Universally Unique Identifier",
-            "description" : "A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_control" } },
-          "groups" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_group" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog:group" : 
-      { "title" : "Control Group",
-        "description" : "A group of controls, or of groups of controls.",
-        "$id" : "#assembly_oscal-catalog_group",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Group Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Group Class",
-            "description" : "A textual label that provides a sub-type or characterization of the group.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Group Title",
-            "description" : "A name given to the group, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "groups" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_group" } },
-          "controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_control" } } },
-        "required" : 
-        [ "title" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog:control" : 
-      { "title" : "Control",
-        "description" : "A structured information object representing a security or privacy control. Each security or privacy control within the Catalog is defined by a distinct control instance.",
-        "$id" : "#assembly_oscal-catalog_control",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Control Identifier",
-            "description" : "A human-oriented, locally unique identifier with instance scope that can be used to reference this control elsewhere in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same control across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Control Class",
-            "description" : "A textual label that provides a sub-type or characterization of the control.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Control Title",
-            "description" : "A name given to the control, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog_control" } } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Catalog Universally Unique Identifier",
+      "description" : "Provides a globally unique means to identify a given catalog instance.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_control" } },
+     "groups" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_group" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-catalog:group" : 
+   { "title" : "Control Group",
+    "description" : "A group of controls, or of groups of controls.",
+    "$id" : "#assembly_oscal-catalog_group",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Group Identifier",
+      "description" : "Identifies the group for the purpose of cross-linking within the defining instance or from other instances that reference the catalog.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Group Class",
+      "description" : "A textual label that provides a sub-type or characterization of the group.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Group Title",
+      "description" : "A name given to the group, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "groups" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_group" } },
+     "controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_control" } } },
+    "required" : 
+    [ "title" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-catalog:control" : 
+   { "title" : "Control",
+    "description" : "A structured object representing a requirement or guideline, which when implemented will reduce an aspect of risk related to an information system and its information.",
+    "$id" : "#assembly_oscal-catalog_control",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Control Identifier",
+      "description" : "Identifies a control such that it can be referenced in the defining catalog and other OSCAL instances (e.g., profiles).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Control Class",
+      "description" : "A textual label that provides a sub-type or characterization of the control.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Control Title",
+      "description" : "A name given to the control, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "mapping" : 
+     { "title" : "Mapping",
+      "description" : "A mapping between the containing control and another resource.",
+      "type" : "object",
+      "properties" : 
+      { "uuid" : 
+       { "title" : "Mapping Identifier",
+        "description" : "The unique identifier for the mapping.",
+        "$ref" : "#/definitions/UUIDDatatype" },
+       "target-resource" : 
+       { "$ref" : "#assembly_oscal-mapping-common_mapping-resource-reference" },
+       "maps" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-mapping-common_map" } } },
+      "required" : 
+      [ "uuid",
+       "target-resource",
+       "maps" ],
+      "additionalProperties" : false },
+     "controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-catalog_control" } } },
+    "required" : 
+    [ "id",
+     "title" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Revision History Entry",
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Location",
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
+            [ 
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-complete-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-complete-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-complete-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
+            "$ref" : "#/definitions/URIReferenceDatatype" },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
+          "media-type" : 
+          { "title" : "Media Type",
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
+          "value" : 
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-complete-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-complete-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-complete-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-complete-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-mapping-common:map" : 
+   { "title" : "Mapping Entry",
+    "description" : "A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.",
+    "$id" : "#assembly_oscal-mapping-common_map",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Entry Identifier",
+      "description" : "The unique identifier for the mapping entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "relationship" : 
+     { "title" : "Mapping Entry Relationship",
+      "description" : "The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.",
+      "type" : "object",
+      "properties" : 
+      { "ns" : 
+       { "title" : "Relationship Value Namespace",
+        "description" : "A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.",
+        "$ref" : "#/definitions/URIDatatype" },
+       "type" : 
+       { "$ref" : "#/definitions/TokenDatatype" } },
+      "required" : 
+      [ "type" ],
+      "additionalProperties" : false },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_mapping-item" } },
+     "targets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_mapping-item" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "relationship",
+     "sources",
+     "targets" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-mapping-common:mapping-item" : 
+   { "title" : "Mapping Entry Item (source or target)",
+    "description" : "Identifies a specific edge within a source or target that is the subject of a mapping.",
+    "$id" : "#assembly_oscal-mapping-common_mapping-item",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "The semantic type of the subject.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "control",
+         "statement" ] } ] },
+     "id-ref" : 
+     { "title" : "Subject Identifier Reference",
+      "description" : "A reference to an identified subject that is of the specified type.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "id-ref" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-mapping-common:mapping-resource-reference" : 
+   { "title" : "Mapped Resource Reference",
+    "description" : "A reference to a resource that is either the source or target of a mapping.",
+    "$id" : "#assembly_oscal-mapping-common_mapping-resource-reference",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Resource Type",
+      "description" : "The semantic type of the resource.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "catalog" ] } ] },
+     "href" : 
+     { "title" : "Catalog or Profile Reference",
+      "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-mapping:mapping-collection" : 
+   { "title" : "Mapping Collection",
+    "description" : "A collection of relationship-based control and/or control statement mappings.",
+    "$id" : "#assembly_oscal-mapping_mapping-collection",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Collection Universally Unique Identifier",
+      "description" : "A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "mappings" : 
+     { "anyOf" : 
+      [ 
+       { "$ref" : "#assembly_oscal-mapping_mapping" },
+       
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-mapping_mapping" } } ] },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "mappings" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-mapping:mapping" : 
+   { "title" : "Control Mapping",
+    "description" : "A mapping between two target resources.",
+    "$id" : "#assembly_oscal-mapping_mapping",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined UUID of the mapping can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same mapping across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "source-resource" : 
+     { "$ref" : "#assembly_oscal-mapping-common_mapping-resource-reference" },
+     "target-resource" : 
+     { "$ref" : "#assembly_oscal-mapping-common_mapping-resource-reference" },
+     "maps" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_map" } } },
+    "required" : 
+    [ "uuid",
+     "source-resource",
+     "target-resource",
+     "maps" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:profile" : 
+   { "title" : "Profile",
+    "description" : "Each OSCAL profile is defined by a profile element.",
+    "$id" : "#assembly_oscal-profile_profile",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Profile Universally Unique Identifier",
+      "description" : "Provides a globally unique means to identify a given profile instance.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "imports" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_import" } },
+     "merge" : 
+     { "$ref" : "#assembly_oscal-profile_merge" },
+     "modify" : 
+     { "$ref" : "#assembly_oscal-profile_modify" },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "imports" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:import" : 
+   { "title" : "Import Resource",
+    "description" : "Designates a referenced source catalog or profile that provides a source of control information for use in creating a new overlay or baseline.",
+    "$id" : "#assembly_oscal-profile_import",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Catalog or Profile Reference",
+      "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
+     "exclude-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:merge" : 
+   { "title" : "Merge Controls",
+    "description" : "Provides structuring directives that instruct how controls are organized after profile resolution.",
+    "$id" : "#assembly_oscal-profile_merge",
+    "type" : "object",
+    "properties" : 
+    { "combine" : 
+     { "title" : "Combination Rule",
+      "description" : "A Combine element defines how to resolve duplicate instances of the same control (e.g., controls with the same ID).",
+      "type" : "object",
+      "properties" : 
+      { "method" : 
+       { "title" : "Combination Method",
+        "description" : "Declare how clashing controls should be handled.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/StringDatatype" },
+         
+         { "enum" : 
+          [ "use-first",
+           "merge",
+           "keep" ] } ] } },
+      "additionalProperties" : false },
+     "flat" : 
+     { "title" : "Flat Without Grouping",
+      "description" : "Directs that controls appear without any grouping structure.",
+      "type" : "object",
+      "additionalProperties" : false },
+     "as-is" : 
+     { "title" : "Group As-Is",
+      "description" : "Indicates that the controls selected should retain their original grouping as defined in the import source.",
+      "$ref" : "#/definitions/BooleanDatatype" },
+     "custom" : 
+     { "title" : "Custom Grouping",
+      "description" : "Provides an alternate grouping structure that selected controls will be placed in.",
+      "type" : "object",
+      "properties" : 
+      { "groups" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-profile_group" } },
+       "insert-controls" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
+      "additionalProperties" : false } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:group" : 
+   { "title" : "Control Group",
+    "description" : "A group of (selected) controls or of groups of controls.",
+    "$id" : "#assembly_oscal-profile_group",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Group Identifier",
+      "description" : "Identifies the group.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Group Class",
+      "description" : "A textual label that provides a sub-type or characterization of the group.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Group Title",
+      "description" : "A name to be given to the group for use in display.",
+      "type" : "string" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "groups" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_group" } },
+     "insert-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
+    "required" : 
+    [ "title" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:modify" : 
+   { "title" : "Modify Controls",
+    "description" : "Set parameters or amend controls in resolution.",
+    "$id" : "#assembly_oscal-profile_modify",
+    "type" : "object",
+    "properties" : 
+    { "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Setting",
+       "description" : "A parameter setting, to be propagated to points of insertion.",
+       "type" : "object",
+       "properties" : 
+       { "param-id" : 
+        { "title" : "Parameter ID",
+         "description" : "An identifier for the parameter.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "class" : 
+        { "title" : "Parameter Class",
+         "description" : "A textual label that provides a characterization of the parameter.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "depends-on" : 
+        { "title" : "Depends On",
+         "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "label" : 
+        { "title" : "Parameter Label",
+         "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+         "type" : "string" },
+        "usage" : 
+        { "title" : "Parameter Usage Description",
+         "description" : "Describes the purpose and use of a parameter.",
+         "type" : "string" },
+        "constraints" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+        "guidelines" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+        "values" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-control-common_parameter-value" } },
+        "select" : 
+        { "$ref" : "#assembly_oscal-control-common_parameter-selection" } },
+       "required" : 
+       [ "param-id" ],
+       "additionalProperties" : false } },
+     "alters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Alteration",
+       "description" : "Specifies changes to be made to an included control when a profile is resolved.",
+       "type" : "object",
+       "properties" : 
+       { "control-id" : 
+        { "title" : "Control Identifier Reference",
+         "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "removes" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Removal",
+          "description" : "Specifies objects to be removed from a control based on specific aspects of the object that must all match.",
+          "type" : "object",
+          "properties" : 
+          { "by-name" : 
+           { "title" : "Reference by (assigned) name",
+            "description" : "Identify items remove by matching their assigned name.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
+           "by-class" : 
+           { "title" : "Reference by class",
+            "description" : "Identify items to remove by matching their class.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
+           "by-id" : 
+           { "title" : "Reference by ID",
+            "description" : "Identify items to remove indicated by their id.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+           "by-item-name" : 
+           { "title" : "Item Name Reference",
+            "description" : "Identify items to remove by the name of the item's information object name, e.g. title or prop.",
             "allOf" : 
             [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:revision" : 
-      { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:location" : 
-      { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-complete-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-complete-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-complete-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
-          "media-type" : 
-          { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
-          "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-complete-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-complete-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-complete-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-complete-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:profile" : 
-      { "title" : "Profile",
-        "description" : "Each OSCAL profile is defined by a Profile element",
-        "$id" : "#assembly_oscal-profile_profile",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Profile Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this profile elsewhere in this or other OSCAL instances. The locally defined UUID of the profile can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This identifier should be assigned per-subject, which means it should be consistently used to identify the same profile across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "imports" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_import" } },
-          "merge" : 
-          { "$ref" : "#assembly_oscal-profile_merge" },
-          "modify" : 
-          { "$ref" : "#assembly_oscal-profile_modify" },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "imports" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:import" : 
-      { "title" : "Import resource",
-        "description" : "The import designates a catalog or profile to be included (referenced and potentially modified) by this profile. The import also identifies which controls to select using the include-all, include-controls, and exclude-controls directives.",
-        "$id" : "#assembly_oscal-profile_import",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Catalog or Profile Reference",
-            "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
-          "exclude-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:merge" : 
-      { "title" : "Merge controls",
-        "description" : "A Merge element provides structuring directives that drive how controls are organized after resolution.",
-        "$id" : "#assembly_oscal-profile_merge",
-        "type" : "object",
-        "properties" : 
-        { "combine" : 
-          { "title" : "Combination rule",
-            "description" : "A Combine element defines how to combine multiple (competing) versions of the same control.",
-            "type" : "object",
-            "properties" : 
-            { "method" : 
-              { "title" : "Combination method",
-                "description" : "How clashing controls should be handled",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/StringDatatype" },
-                  
-                  { "enum" : 
-                    [ "use-first",
-                      "merge",
-                      "keep" ] } ] } },
-            "additionalProperties" : false },
-          "flat" : 
-          { "title" : "Flat",
-            "description" : "Use the flat structuring method.",
-            "type" : "object",
-            "additionalProperties" : false },
-          "as-is" : 
-          { "title" : "As-Is Structuring Directive",
-            "description" : "An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.",
-            "$ref" : "#/definitions/BooleanDatatype" },
-          "custom" : 
-          { "title" : "Custom grouping",
-            "description" : "A Custom element frames a structure for embedding represented controls in resolution.",
-            "type" : "object",
-            "properties" : 
-            { "groups" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-profile_group" } },
-              "insert-controls" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
-            "additionalProperties" : false } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:group" : 
-      { "title" : "Control group",
-        "description" : "A group of (selected) controls or of groups of controls",
-        "$id" : "#assembly_oscal-profile_group",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Group Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Group Class",
-            "description" : "A textual label that provides a sub-type or characterization of the group.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Group Title",
-            "description" : "A name given to the group, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "groups" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_group" } },
-          "insert-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
-        "required" : 
-        [ "title" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:modify" : 
-      { "title" : "Modify controls",
-        "description" : "Set parameters or amend controls in resolution",
-        "$id" : "#assembly_oscal-profile_modify",
-        "type" : "object",
-        "properties" : 
-        { "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Setting",
-              "description" : "A parameter setting, to be propagated to points of insertion",
-              "type" : "object",
-              "properties" : 
-              { "param-id" : 
-                { "title" : "Parameter ID",
-                  "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "class" : 
-                { "title" : "Parameter Class",
-                  "description" : "A textual label that provides a characterization of the parameter.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "depends-on" : 
-                { "title" : "Depends on",
-                  "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "label" : 
-                { "title" : "Parameter Label",
-                  "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-                  "type" : "string" },
-                "usage" : 
-                { "title" : "Parameter Usage Description",
-                  "description" : "Describes the purpose and use of a parameter",
-                  "type" : "string" },
-                "constraints" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-                "guidelines" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-                "values" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-                "select" : 
-                { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" } },
-              "required" : 
-              [ "param-id" ],
-              "additionalProperties" : false } },
-          "alters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_alter" } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:insert-controls" : 
-      { "title" : "Select controls",
-        "description" : "Specifies which controls to use in the containing context.",
-        "$id" : "#assembly_oscal-profile_insert-controls",
-        "type" : "object",
-        "properties" : 
-        { "order" : 
-          { "title" : "Order",
-            "description" : "A designation of how a selection of controls in a profile is to be ordered.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "keep",
-                  "ascending",
-                  "descending" ] } ] },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
-          "exclude-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:select-control-by-id" : 
-      { "title" : "Call",
-        "description" : "Call a control by its ID",
-        "$id" : "#assembly_oscal-profile_select-control-by-id",
-        "type" : "object",
-        "properties" : 
-        { "with-child-controls" : 
-          { "title" : "Include contained controls with control",
-            "description" : "When a control is included, whether its child (dependent) controls are also included.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "yes",
-                  "no" ] } ] },
-          "with-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Match Controls by Identifier",
-              "description" : "",
-              "$ref" : "#/definitions/TokenDatatype" } },
-          "matching" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Match Controls by Pattern",
-              "description" : "Select controls by (regular expression) match on ID",
-              "type" : "object",
-              "properties" : 
-              { "pattern" : 
-                { "title" : "Pattern",
-                  "description" : "A glob expression matching the IDs of one or more controls to be selected.",
-                  "$ref" : "#/definitions/StringDatatype" } },
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:alter" : 
-      { "title" : "Alteration",
-        "description" : "An Alter element specifies changes to be made to an included control when a profile is resolved.",
-        "$id" : "#assembly_oscal-profile_alter",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "removes" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_remove" } },
-          "adds" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_add" } } },
-        "required" : 
-        [ "control-id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:remove" : 
-      { "title" : "Removal",
-        "description" : "Specifies objects to be removed from a control based on specific aspects of the object that must all match.",
-        "$id" : "#assembly_oscal-profile_remove",
-        "type" : "object",
-        "properties" : 
-        { "by-name" : 
-          { "title" : "Reference by (assigned) name",
-            "description" : "Identify items to remove by matching their assigned name",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "by-class" : 
-          { "title" : "Reference by class",
-            "description" : "Identify items to remove by matching their class.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "by-id" : 
-          { "title" : "Reference by ID",
-            "description" : "Identify items to remove indicated by their id.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "by-item-name" : 
-          { "title" : "Item Name Reference",
-            "description" : "Identify items to remove by the name of the item's information element name, e.g. title or prop",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "by-ns" : 
-          { "title" : "Item Namespace Reference",
-            "description" : "Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-profile:add" : 
-      { "title" : "Addition",
-        "description" : "Specifies contents to be added into controls, in resolution",
-        "$id" : "#assembly_oscal-profile_add",
-        "type" : "object",
-        "properties" : 
-        { "position" : 
-          { "title" : "Position",
-            "description" : "Where to add the new content with respect to the targeted element (beside it or inside it)",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "before",
-                  "after",
-                  "starting",
-                  "ending" ] } ] },
-          "by-id" : 
-          { "title" : "Reference by ID",
-            "description" : "Target location of the addition.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Title Change",
-            "description" : "A name given to the control, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:component-definition" : 
-      { "title" : "Component Definition",
-        "description" : "A collection of component descriptions, which may optionally be grouped by capability.",
-        "$id" : "#assembly_oscal-component-definition_component-definition",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Definition Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component definition elsewhere in this or other OSCAL instances. The locally defined UUID of the component definition can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-component-definitions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_import-component-definition" } },
-          "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_defined-component" } },
-          "capabilities" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_capability" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:import-component-definition" : 
-      { "title" : "Import Component Definition",
-        "description" : "Loads a component definition from another resource.",
-        "$id" : "#assembly_oscal-component-definition_import-component-definition",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hyperlink Reference",
-            "description" : "A link to a resource that defines a set of components and/or capabilities to import into this collection.",
-            "$ref" : "#/definitions/URIReferenceDatatype" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:defined-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-component-definition_defined-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "control-implementations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:capability" : 
-      { "title" : "Capability",
-        "description" : "A grouping of other components and/or capabilities.",
-        "$id" : "#assembly_oscal-component-definition_capability",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Capability Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this capability elsewhere in this or other OSCAL instances. The locally defined UUID of the capability can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Capability Name",
-            "description" : "The capability's human-readable name.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Capability Description",
-            "description" : "A summary of the capability.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "incorporates-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_incorporates-component" } },
-          "control-implementations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "name",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:incorporates-component" : 
-      { "title" : "Incorporates Component",
-        "description" : "TBD",
-        "$id" : "#assembly_oscal-component-definition_incorporates-component",
-        "type" : "object",
-        "properties" : 
-        { "component-uuid" : 
-          { "title" : "Component Reference",
-            "description" : "A machine-oriented identifier reference to a component.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" } },
-        "required" : 
-        [ "component-uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:control-implementation" : 
-      { "title" : "Control Implementation Set",
-        "description" : "Defines how the component or capability supports a set of controls.",
-        "$id" : "#assembly_oscal-component-definition_control-implementation",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Control Implementation Set Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a set of implemented controls elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation set can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "source" : 
-          { "title" : "Source Resource Reference",
-            "description" : "A reference to an OSCAL catalog or profile providing the referenced control or subcontrol definition.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "A description of how the specified set of controls are implemented for the containing component or capability.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implemented-requirements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_implemented-requirement" } } },
-        "required" : 
-        [ "uuid",
-          "source",
-          "description",
-          "implemented-requirements" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:implemented-requirement" : 
-      { "title" : "Control Implementation",
-        "description" : "Describes how the containing component or capability implements an individual control.",
-        "$id" : "#assembly_oscal-component-definition_implemented-requirement",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Control Implementation Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a specific control implementation elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "A suggestion for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "statements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_statement" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "control-id",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-component-definition:statement" : 
-      { "title" : "Control Statement Implementation",
-        "description" : "Identifies which statements within a control are addressed.",
-        "$id" : "#assembly_oscal-component-definition_statement",
-        "type" : "object",
-        "properties" : 
-        { "statement-id" : 
-          { "title" : "Control Statement Reference",
-            "description" : "A human-oriented identifier reference to a control statement.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "uuid" : 
-          { "title" : "Control Statement Reference Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Statement Implementation Description",
-            "description" : "A summary of how the containing control statement is implemented by the component or capability.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "statement-id",
-          "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:system-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-implementation-common_system-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "this-system",
-                  "system",
-                  "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation",
-                  "network" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the system component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Status",
-            "description" : "Describes the operational status of the system component.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "State",
-                "description" : "The operational status.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "under-development",
-                      "operational",
-                      "disposition",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:protocol" : 
-      { "title" : "Service Protocol Information",
-        "description" : "Information about the protocol used to provide a service.",
-        "$id" : "#assembly_oscal-implementation-common_protocol",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Service Protocol Information Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Protocol Name",
-            "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "title" : 
-          { "title" : "Protocol Title",
-            "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
-            "type" : "string" },
-          "port-ranges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:port-range" : 
-      { "title" : "Port Range",
-        "description" : "Where applicable this is the IPv4 port range on which the service operates.",
-        "$id" : "#assembly_oscal-implementation-common_port-range",
-        "type" : "object",
-        "properties" : 
-        { "start" : 
-          { "title" : "Start",
-            "description" : "Indicates the starting port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "end" : 
-          { "title" : "End",
-            "description" : "Indicates the ending port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "transport" : 
-          { "title" : "Transport",
-            "description" : "Indicates the transport type.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "TCP",
-                  "UDP" ] } ] } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:implementation-status" : 
-      { "title" : "Implementation Status",
-        "description" : "Indicates the degree to which the a given control is implemented.",
-        "$id" : "#assembly_oscal-implementation-common_implementation-status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "Implementation State",
-            "description" : "Identifies the implementation status of the control or control objective.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "implemented",
-                  "partial",
-                  "planned",
-                  "alternative",
-                  "not-applicable" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:system-user" : 
-      { "title" : "System User",
-        "description" : "A type of user that interacts with the system based on an associated role.",
-        "$id" : "#assembly_oscal-implementation-common_system-user",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "User Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "User Title",
-            "description" : "A name given to the user, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "User Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the user.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "User Description",
-            "description" : "A summary of the user's purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:authorized-privilege" : 
-      { "title" : "Privilege",
-        "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
-        "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Privilege Title",
-            "description" : "A human readable name for the privilege.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Privilege Description",
-            "description" : "A summary of the privilege's purpose within the system.",
-            "type" : "string" },
-          "functions-performed" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" : 
-        [ "title",
-          "functions-performed" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:function-performed" : 
-      { "title" : "Functions Performed",
-        "description" : "Describes a function performed for a given authorized privilege by this user class.",
-        "$id" : "#field_oscal-implementation-common_function-performed",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-implementation-common:inventory-item" : 
-      { "title" : "Inventory Item",
-        "description" : "A single managed inventory item within the system.",
-        "$id" : "#assembly_oscal-implementation-common_inventory-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Inventory Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Inventory Item Description",
-            "description" : "A summary of the inventory item stating its purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Implemented Component",
-              "description" : "The set of components that are implemented in a given system inventory item.",
-              "type" : "object",
-              "properties" : 
-              { "component-uuid" : 
-                { "title" : "Component Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "component-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:set-parameter" : 
-      { "title" : "Set Parameter Value",
-        "description" : "Identifies the parameter that will be set by the enclosed value.",
-        "$id" : "#assembly_oscal-implementation-common_set-parameter",
-        "type" : "object",
-        "properties" : 
-        { "param-id" : 
-          { "title" : "Parameter ID",
-            "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Value",
-              "description" : "A parameter value or set of values.",
-              "$ref" : "#/definitions/StringDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "param-id",
-          "values" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-implementation-common:system-id" : 
-      { "title" : "System Identification",
-        "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
-        "$id" : "#field_oscal-implementation-common_system-id",
-        "type" : "object",
-        "properties" : 
-        { "identifier-type" : 
-          { "title" : "Identification System Type",
-            "description" : "Identifies the identification system from which the provided identifier was assigned.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "https://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal",
-                  "https://ietf.org/rfc/rfc4122",
-                  "http://ietf.org/rfc/rfc4122" ] } ] },
-          "id" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-security-plan" : 
-      { "title" : "System Security Plan (SSP)",
-        "description" : "A system security plan, such as those described in NIST SP 800-18",
-        "$id" : "#assembly_oscal-ssp_system-security-plan",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "System Security Plan Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-profile" : 
-          { "$ref" : "#assembly_oscal-ssp_import-profile" },
-          "system-characteristics" : 
-          { "$ref" : "#assembly_oscal-ssp_system-characteristics" },
-          "system-implementation" : 
-          { "$ref" : "#assembly_oscal-ssp_system-implementation" },
-          "control-implementation" : 
-          { "$ref" : "#assembly_oscal-ssp_control-implementation" },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "import-profile",
-          "system-characteristics",
-          "system-implementation",
-          "control-implementation" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:import-profile" : 
-      { "title" : "Import Profile",
-        "description" : "Used to import the OSCAL profile representing the system's control baseline.",
-        "$id" : "#assembly_oscal-ssp_import-profile",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Profile Reference",
-            "description" : "A resolvable URL reference to the profile or catalog to use as the system's control baseline.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-characteristics" : 
-      { "title" : "System Characteristics",
-        "description" : "Contains the characteristics of the system, such as its name, purpose, and security impact level.",
-        "$id" : "#assembly_oscal-ssp_system-characteristics",
-        "type" : "object",
-        "properties" : 
-        { "system-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_system-id" } },
-          "system-name" : 
-          { "title" : "System Name - Full",
-            "description" : "The full name of the system.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "system-name-short" : 
-          { "title" : "System Name - Short",
-            "description" : "A short name for the system, such as an acronym, that is suitable for display in a data table or summary list.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "System Description",
-            "description" : "A summary of the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "date-authorized" : 
-          { "$ref" : "#field_oscal-ssp_date-authorized" },
-          "security-sensitivity-level" : 
-          { "title" : "Security Sensitivity Level",
-            "description" : "The overall information system sensitivity categorization, such as defined by FIPS-199.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "system-information" : 
-          { "$ref" : "#assembly_oscal-ssp_system-information" },
-          "security-impact-level" : 
-          { "$ref" : "#assembly_oscal-ssp_security-impact-level" },
-          "status" : 
-          { "$ref" : "#assembly_oscal-ssp_status" },
-          "authorization-boundary" : 
-          { "$ref" : "#assembly_oscal-ssp_authorization-boundary" },
-          "network-architecture" : 
-          { "$ref" : "#assembly_oscal-ssp_network-architecture" },
-          "data-flow" : 
-          { "$ref" : "#assembly_oscal-ssp_data-flow" },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "system-ids",
-          "system-name",
-          "description",
-          "security-sensitivity-level",
-          "system-information",
-          "security-impact-level",
-          "status",
-          "authorization-boundary" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-information" : 
-      { "title" : "System Information",
-        "description" : "Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
-        "$id" : "#assembly_oscal-ssp_system-information",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "information-types" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Information Type",
-              "description" : "Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Information Type Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "title field",
-                  "description" : "A human readable name for the information type. This title should be meaningful within the context of the system.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Information Type Description",
-                  "description" : "A summary of how this information type is used within the system.",
-                  "type" : "string" },
-                "categorizations" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Information Type Categorization",
-                    "description" : "A set of information type identifiers qualified by the given identification system used, such as NIST SP 800-60.",
-                    "type" : "object",
-                    "properties" : 
-                    { "system" : 
-                      { "title" : "Information Type Identification System",
-                        "description" : "Specifies the information type identification system used.",
-                        "anyOf" : 
-                        [ 
-                          { "$ref" : "#/definitions/URIDatatype" },
-                          
-                          { "enum" : 
-                            [ "http://doi.org/10.6028/NIST.SP.800-60v2r1" ] } ] },
-                      "information-type-ids" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "title" : "Information Type Systematized Identifier",
-                          "description" : "A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                          "$ref" : "#/definitions/StringDatatype" } } },
-                    "required" : 
-                    [ "system" ],
-                    "additionalProperties" : false } },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "confidentiality-impact" : 
-                { "title" : "Confidentiality Impact Level",
-                  "description" : "The expected level of impact resulting from the unauthorized disclosure of the described information.",
-                  "type" : "object",
-                  "properties" : 
-                  { "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" : 
-                    { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" : 
-                    { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" : 
-                    { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" : 
-                  [ "base" ],
-                  "additionalProperties" : false },
-                "integrity-impact" : 
-                { "title" : "Integrity Impact Level",
-                  "description" : "The expected level of impact resulting from the unauthorized modification of the described information.",
-                  "type" : "object",
-                  "properties" : 
-                  { "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" : 
-                    { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" : 
-                    { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" : 
-                    { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" : 
-                  [ "base" ],
-                  "additionalProperties" : false },
-                "availability-impact" : 
-                { "title" : "Availability Impact Level",
-                  "description" : "The expected level of impact resulting from the disruption of access to or use of the described information or the information system.",
-                  "type" : "object",
-                  "properties" : 
-                  { "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" : 
-                    { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" : 
-                    { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" : 
-                    { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" : 
-                  [ "base" ],
-                  "additionalProperties" : false } },
-              "required" : 
-              [ "title",
-                "description",
-                "confidentiality-impact",
-                "integrity-impact",
-                "availability-impact" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "information-types" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:base" : 
-      { "title" : "Base Level (Confidentiality, Integrity, or Availability)",
-        "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.",
-        "$id" : "#field_oscal-ssp_base",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-ssp:selected" : 
-      { "title" : "Selected Level (Confidentiality, Integrity, or Availability)",
-        "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.",
-        "$id" : "#field_oscal-ssp_selected",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-complete-oscal-ssp:adjustment-justification" : 
-      { "title" : "Adjustment Justification",
-        "description" : "If the selected security level is different from the base security level, this contains the justification for the change.",
-        "$id" : "#field_oscal-ssp_adjustment-justification",
-        "type" : "string" },
-      "oscal-complete-oscal-ssp:security-impact-level" : 
-      { "title" : "Security Impact Level",
-        "description" : "The overall level of expected impact resulting from unauthorized disclosure, modification, or loss of access to information.",
-        "$id" : "#assembly_oscal-ssp_security-impact-level",
-        "type" : "object",
-        "properties" : 
-        { "security-objective-confidentiality" : 
-          { "title" : "Security Objective: Confidentiality",
-            "description" : "A target-level of confidentiality for the system, based on the sensitivity of information within the system.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "security-objective-integrity" : 
-          { "title" : "Security Objective: Integrity",
-            "description" : "A target-level of integrity for the system, based on the sensitivity of information within the system.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "security-objective-availability" : 
-          { "title" : "Security Objective: Availability",
-            "description" : "A target-level of availability for the system, based on the sensitivity of information within the system.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "security-objective-confidentiality",
-          "security-objective-integrity",
-          "security-objective-availability" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:status" : 
-      { "title" : "Status",
-        "description" : "Describes the operational status of the system.",
-        "$id" : "#assembly_oscal-ssp_status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "State",
-            "description" : "The current operating status.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "operational",
-                  "under-development",
-                  "under-major-modification",
-                  "disposition",
-                  "other" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:date-authorized" : 
-      { "title" : "System Authorization Date",
-        "description" : "The date the system received its authorization.",
-        "$id" : "#field_oscal-ssp_date-authorized",
-        "$ref" : "#/definitions/DateDatatype" },
-      "oscal-complete-oscal-ssp:authorization-boundary" : 
-      { "title" : "Authorization Boundary",
-        "description" : "A description of this system's authorization boundary, optionally supplemented by diagrams that illustrate the authorization boundary.",
-        "$id" : "#assembly_oscal-ssp_authorization-boundary",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Authorization Boundary Description",
-            "description" : "A summary of the system's authorization boundary.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:diagram" : 
-      { "title" : "Diagram",
-        "description" : "A graphic that provides a visual representation the system, or some aspect of it.",
-        "$id" : "#assembly_oscal-ssp_diagram",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Diagram ID",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Diagram Description",
-            "description" : "A summary of the diagram.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "caption" : 
-          { "title" : "Caption",
-            "description" : "A brief caption to annotate the diagram.",
-            "type" : "string" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:network-architecture" : 
-      { "title" : "Network Architecture",
-        "description" : "A description of the system's network architecture, optionally supplemented by diagrams that illustrate the network architecture.",
-        "$id" : "#assembly_oscal-ssp_network-architecture",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Network Architecture Description",
-            "description" : "A summary of the system's network architecture.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:data-flow" : 
-      { "title" : "Data Flow",
-        "description" : "A description of the logical flow of information within the system and across its boundaries, optionally supplemented by diagrams that illustrate these flows.",
-        "$id" : "#assembly_oscal-ssp_data-flow",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Data Flow Description",
-            "description" : "A summary of the system's data flow.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:system-implementation" : 
-      { "title" : "System Implementation",
-        "description" : "Provides information as to how the system is implemented.",
-        "$id" : "#assembly_oscal-ssp_system-implementation",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "leveraged-authorizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Leveraged Authorization",
-              "description" : "A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Leveraged Authorization Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "title field",
-                  "description" : "A human readable name for the leveraged authorization in the context of the system.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "party-uuid" : 
-                { "title" : "party-uuid field",
-                  "description" : "A machine-oriented identifier reference to the party that manages the leveraged system.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "date-authorized" : 
-                { "$ref" : "#field_oscal-ssp_date-authorized" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "title",
-                "party-uuid",
-                "date-authorized" ],
-              "additionalProperties" : false } },
-          "users" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-          "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "users",
-          "components" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:control-implementation" : 
-      { "title" : "Control Implementation",
-        "description" : "Describes how the system satisfies a set of controls.",
-        "$id" : "#assembly_oscal-ssp_control-implementation",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "A statement describing important things to know about how this set of control satisfaction documentation is approached.",
-            "type" : "string" },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implemented-requirements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_implemented-requirement" } } },
-        "required" : 
-        [ "description",
-          "implemented-requirements" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:implemented-requirement" : 
-      { "title" : "Control-based Requirement",
-        "description" : "Describes how the system satisfies the requirements of an individual control.",
-        "$id" : "#assembly_oscal-ssp_implemented-requirement",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Control Requirement Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "statements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_statement" } },
-          "by-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_by-component" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "control-id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:statement" : 
-      { "title" : "Specific Control Statement",
-        "description" : "Identifies which statements within a control are addressed.",
-        "$id" : "#assembly_oscal-ssp_statement",
-        "type" : "object",
-        "properties" : 
-        { "statement-id" : 
-          { "title" : "Control Statement Reference",
-            "description" : "A human-oriented identifier reference to a control statement.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "uuid" : 
-          { "title" : "Control Statement Reference Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "by-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_by-component" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "statement-id",
-          "uuid" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ssp:by-component" : 
-      { "title" : "Component Control Implementation",
-        "description" : "Defines how the referenced component implements a set of controls.",
-        "$id" : "#assembly_oscal-ssp_by-component",
-        "type" : "object",
-        "properties" : 
-        { "component-uuid" : 
-          { "title" : "Component Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to the component that is implemeting a given control.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "uuid" : 
-          { "title" : "By-Component Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "An implementation statement that describes how a control or a control statement is implemented within the referenced system component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implementation-status" : 
-          { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "export" : 
-          { "title" : "Export",
-            "description" : "Identifies content intended for external consumption, such as with leveraged organizations.",
-            "type" : "object",
-            "properties" : 
-            { "description" : 
-              { "title" : "Control Implementation Export Description",
-                "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be available to another system leveraging this system.",
-                "type" : "string" },
-              "props" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-metadata_property" } },
-              "links" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-metadata_link" } },
-              "provided" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Provided Control Implementation",
-                  "description" : "Describes a capability which may be inherited by a leveraging system.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Provided Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "description" : 
-                    { "title" : "Provided Control Implementation Description",
-                      "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be provided to another system leveraging this system.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "responsible-roles" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "description" ],
-                  "additionalProperties" : false } },
-              "responsibilities" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Control Implementation Responsibility",
-                  "description" : "Describes a control implementation responsibility imposed on a leveraging system.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Responsibility Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "provided-uuid" : 
-                    { "title" : "Provided UUID",
-                      "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "description" : 
-                    { "title" : "Control Implementation Responsibility Description",
-                      "description" : "An implementation statement that describes the aspects of the control or control statement implementation that a leveraging system must implement to satisfy the control provided by a leveraged system.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "responsible-roles" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "description" ],
-                  "additionalProperties" : false } },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "additionalProperties" : false },
-          "inherited" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Inherited Control Implementation",
-              "description" : "Describes a control implementation inherited by a leveraging system.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Inherited Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "provided-uuid" : 
-                { "title" : "Provided UUID",
-                  "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Inherited Control Implementation Description",
-                  "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is inheriting from a leveraged system.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "satisfied" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Satisfied Control Implementation Responsibility",
-              "description" : "Describes how this system satisfies a responsibility imposed by a leveraged system.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Satisfied Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "responsibility-uuid" : 
-                { "title" : "Responsibility UUID",
-                  "description" : "A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Satisfied Control Implementation Responsibility Description",
-                  "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is implementing based on a requirement from a leveraged system.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "component-uuid",
-          "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ap:assessment-plan" : 
-      { "title" : "Security Assessment Plan (SAP)",
-        "description" : "An assessment plan, such as those provided by a FedRAMP assessor.",
-        "$id" : "#assembly_oscal-ap_assessment-plan",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Plan Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" : 
-          { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "local-definitions" : 
-          { "title" : "Local Definitions",
-            "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
-            "type" : "object",
-            "properties" : 
-            { "components" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "objectives-and-methods" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "additionalProperties" : false },
-          "terms-and-conditions" : 
-          { "title" : "Assessment Plan Terms and Conditions",
-            "description" : "Used to define various terms and conditions under which an assessment, described by the plan, can be performed. Each child part defines a different type of term or condition.",
-            "type" : "object",
-            "properties" : 
-            { "parts" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
-            "additionalProperties" : false },
-          "reviewed-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "assessment-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "assessment-assets" : 
-          { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "import-ssp",
-          "reviewed-controls" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:import-ssp" : 
-      { "title" : "Import System Security Plan",
-        "description" : "Used by the assessment plan and POA&M to import information about the system.",
-        "$id" : "#assembly_oscal-assessment-common_import-ssp",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "System Security Plan Reference",
-            "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:local-objective" : 
-      { "title" : "Assessment-Specific Control Objective",
-        "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_local-objective",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "description" : 
-          { "title" : "Objective Description",
-            "description" : "A human-readable description of this control objective.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-id",
-          "parts" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-method" : 
-      { "title" : "Assessment Method",
-        "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-method",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Method Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Method Description",
-            "description" : "A human-readable description of this assessment method.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" : 
-          { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "part" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:activity" : 
-      { "title" : "Activity",
-        "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
-        "$id" : "#assembly_oscal-assessment-common_activity",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Activity Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Included Activity Title",
-            "description" : "The title for this included activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Included Activity Description",
-            "description" : "A human-readable description of this included activity.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Step",
-              "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Step Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Step Title",
-                  "description" : "The title for this step.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Step Description",
-                  "description" : "A human-readable description of this step.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" : 
-                { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "related-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:task" : 
-      { "title" : "Task",
-        "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_task",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Task Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Task Type",
-            "description" : "The type of task.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "milestone",
-                  "action" ] } ] },
-          "title" : 
-          { "title" : "Task Title",
-            "description" : "The title for this task.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Task Description",
-            "description" : "A human-readable description of this task.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" : 
-          { "title" : "Event Timing",
-            "description" : "The timing under which the task is intended to occur.",
-            "type" : "object",
-            "properties" : 
-            { "on-date" : 
-              { "title" : "On Date Condition",
-                "description" : "The task is intended to occur on the specified date.",
-                "type" : "object",
-                "properties" : 
-                { "date" : 
-                  { "title" : "On Date Condition",
-                    "description" : "The task must occur on the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "date" ],
-                "additionalProperties" : false },
-              "within-date-range" : 
-              { "title" : "On Date Range Condition",
-                "description" : "The task is intended to occur within the specified date range.",
-                "type" : "object",
-                "properties" : 
-                { "start" : 
-                  { "title" : "Start Date Condition",
-                    "description" : "The task must occur on or after the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                  "end" : 
-                  { "title" : "End Date Condition",
-                    "description" : "The task must occur on or before the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "start",
-                  "end" ],
-                "additionalProperties" : false },
-              "at-frequency" : 
-              { "title" : "Frequency Condition",
-                "description" : "The task is intended to occur at the specified frequency.",
-                "type" : "object",
-                "properties" : 
-                { "period" : 
-                  { "title" : "Period",
-                    "description" : "The task must occur after the specified period has elapsed.",
-                    "$ref" : "#/definitions/PositiveIntegerDatatype" },
-                  "unit" : 
-                  { "title" : "Time Unit",
-                    "description" : "The unit of time for the period.",
-                    "allOf" : 
-                    [ 
-                      { "$ref" : "#/definitions/StringDatatype" },
-                      
-                      { "enum" : 
-                        [ "seconds",
-                          "minutes",
-                          "hours",
-                          "days",
-                          "months",
-                          "years" ] } ] } },
-                "required" : 
-                [ "period",
-                  "unit" ],
-                "additionalProperties" : false } },
-            "additionalProperties" : false },
-          "dependencies" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Task Dependency",
-              "description" : "Used to indicate that a task is dependent on another task.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a unique task.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Activity",
-              "description" : "Identifies an individual activity to be performed as part of a task.",
-              "type" : "object",
-              "properties" : 
-              { "activity-uuid" : 
-                { "title" : "Activity Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "activity-uuid",
-                "subjects" ],
-              "additionalProperties" : false } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:reviewed-controls" : 
-      { "title" : "Reviewed Controls and Control Objectives",
-        "description" : "Identifies the controls being assessed and their control objectives.",
-        "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Control Objective Description",
-            "description" : "A human-readable description of control objectives.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessed Controls",
-              "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Assessed Controls Description",
-                  "description" : "A human-readable description of in-scope controls specified for assessment.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "control-objective-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Referenced Control Objectives",
-              "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Control Objectives Description",
-                  "description" : "A human-readable description of this collection of control objectives.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-selections" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:select-control-by-id" : 
-      { "title" : "Select Control",
-        "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
-        "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "statement-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Include Specific Statements",
-              "description" : "Used to constrain the selection to only specificity identified statements.",
-              "$ref" : "#/definitions/TokenDatatype" } } },
-        "required" : 
-        [ "control-id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:select-objective-by-id" : 
-      { "title" : "Select Objective",
-        "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
-        "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
-        "type" : "object",
-        "properties" : 
-        { "objective-id" : 
-          { "title" : "Objective ID",
-            "description" : "Points to an assessment objective.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "objective-id" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-subject-placeholder" : 
-      { "title" : "Assessment Subject Placeholder",
-        "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Subject Placeholder Description",
-            "description" : "A human-readable description of intent of this assessment subject placeholder.",
-            "type" : "string" },
-          "sources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Subject Source",
-              "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "sources" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-subject" : 
-      { "title" : "Subject of Assessment",
-        "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Subject Type",
-            "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user" ] } ] },
-          "description" : 
-          { "title" : "Include Subjects Description",
-            "description" : "A human-readable description of the collection of subjects being included in this assessment.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:select-subject-by-id" : 
-      { "title" : "Select Assessment Subject",
-        "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
-        "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:subject-reference" : 
-      { "title" : "Identifies the Subject",
-        "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
-        "$id" : "#assembly_oscal-assessment-common_subject-reference",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "title" : 
-          { "title" : "Subject Reference Title",
-            "description" : "The title or name for the referenced subject.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-assets" : 
-      { "title" : "Assessment Assets",
-        "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-assets",
-        "type" : "object",
-        "properties" : 
-        { "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Platform",
-              "description" : "Used to represent the toolset used to perform aspects of the assessment.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Assessment Platform Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Assessment Platform Title",
-                  "description" : "The title or name for the assessment platform.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Uses Component",
-                    "description" : "The set of components that are used by the assessment platform.",
-                    "type" : "object",
-                    "properties" : 
-                    { "component-uuid" : 
-                      { "title" : "Component Universally Unique Identifier Reference",
-                        "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                        "$ref" : "#/definitions/UUIDDatatype" },
-                      "props" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" : 
-                      { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" : 
-                    [ "component-uuid" ],
-                    "additionalProperties" : false } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "assessment-platforms" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:finding-target" : 
-      { "title" : "Objective Status",
-        "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
-        "$id" : "#assembly_oscal-assessment-common_finding-target",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Finding Target Type",
-            "description" : "Identifies the type of the target.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "statement-id",
-                  "objective-id" ] } ] },
-          "target-id" : 
-          { "title" : "Finding Target Identifier Reference",
-            "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Objective Status Title",
-            "description" : "The title for this objective status.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Objective Status Description",
-            "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Objective Status",
-            "description" : "A determination of if the objective is satisfied or not within a given system.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "Objective Status State",
-                "description" : "An indication as to whether the objective is satisfied or not.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "satisfied",
-                      "not-satisfied" ] } ] },
-              "reason" : 
-              { "title" : "Objective Status Reason",
-                "description" : "The reason the objective was given it's status.",
-                "anyOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "pass",
-                      "fail",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "implementation-status" : 
-          { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type",
-          "target-id",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:observation" : 
-      { "title" : "Observation",
-        "description" : "Describes an individual observation.",
-        "$id" : "#assembly_oscal-assessment-common_observation",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Observation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Observation Title",
-            "description" : "The title for this observation.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Observation Description",
-            "description" : "A human-readable description of this assessment observation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Method",
-              "description" : "Identifies how the observation was made.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/StringDatatype" },
-                
-                { "enum" : 
-                  [ "EXAMINE",
-                    "INTERVIEW",
-                    "TEST",
-                    "UNKNOWN" ] } ] } },
-          "types" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Type",
-              "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/TokenDatatype" },
-                
-                { "enum" : 
-                  [ "ssp-statement-issue",
-                    "control-objective",
-                    "mitigation",
-                    "finding",
-                    "historic" ] } ] } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Relevant Evidence",
-              "description" : "Links this observation to relevant evidence.",
-              "type" : "object",
-              "properties" : 
-              { "href" : 
-                { "title" : "Relevant Evidence Reference",
-                  "description" : "A resolvable URL reference to relevant evidence.",
-                  "$ref" : "#/definitions/URIReferenceDatatype" },
-                "description" : 
-                { "title" : "Relevant Evidence Description",
-                  "description" : "A human-readable description of this evidence.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "description" ],
-              "additionalProperties" : false } },
-          "collected" : 
-          { "title" : "Collected Field",
-            "description" : "Date/time stamp identifying when the finding information was collected.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "expires" : 
-          { "title" : "Expires Field",
-            "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description",
-          "methods",
-          "collected" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:origin" : 
-      { "title" : "Origin",
-        "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
-        "$id" : "#assembly_oscal-assessment-common_origin",
-        "type" : "object",
-        "properties" : 
-        { "actors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
-        "required" : 
-        [ "actors" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:origin-actor" : 
-      { "title" : "Originating Actor",
-        "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
-        "$id" : "#assembly_oscal-assessment-common_origin-actor",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Actor Type",
-            "description" : "The kind of actor.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "tool",
-                  "assessment-platform",
-                  "party" ] } ] },
-          "actor-uuid" : 
-          { "title" : "Actor Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "type",
-          "actor-uuid" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:related-task" : 
-      { "title" : "Task Reference",
-        "description" : "Identifies an individual task for which the containing object is a consequence of.",
-        "$id" : "#assembly_oscal-assessment-common_related-task",
-        "type" : "object",
-        "properties" : 
-        { "task-uuid" : 
-          { "title" : "Task Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a unique task.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" : 
-          { "title" : "Identified Subject",
-            "description" : "Used to detail assessment subjects that were identfied by this task.",
-            "type" : "object",
-            "properties" : 
-            { "subject-placeholder-uuid" : 
-              { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
-                "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
-                "$ref" : "#/definitions/UUIDDatatype" },
-              "subjects" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" : 
-            [ "subject-placeholder-uuid",
-              "subjects" ],
-            "additionalProperties" : false },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "task-uuid" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:threat-id" : 
-      { "title" : "Threat ID",
-        "description" : "A pointer, by ID, to an externally-defined threat.",
-        "$id" : "#field_oscal-assessment-common_threat-id",
-        "type" : "object",
-        "properties" : 
-        { "system" : 
-          { "title" : "Threat Type Identification System",
-            "description" : "Specifies the source of the threat information.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal" ] } ] },
-          "href" : 
-          { "title" : "Threat Information Resource Reference",
-            "description" : "An optional location for the threat data, from which this ID originates.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "id" : 
-          { "$ref" : "#/definitions/URIDatatype" } },
-        "required" : 
-        [ "id",
-          "system" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:risk" : 
-      { "title" : "Identified Risk",
-        "description" : "An identified risk.",
-        "$id" : "#assembly_oscal-assessment-common_risk",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Risk Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Risk Title",
-            "description" : "The title for this risk.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Risk Description",
-            "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
-            "type" : "string" },
-          "statement" : 
-          { "title" : "Risk Statement",
-            "description" : "An summary of impact for how the risk affects the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "$ref" : "#field_oscal-assessment-common_risk-status" },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Mitigating Factor",
-              "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Mitigating Factor Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "implementation-uuid" : 
-                { "title" : "Implementation UUID",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Mitigating Factor Description",
-                  "description" : "A human-readable description of this mitigating factor.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "deadline" : 
-          { "title" : "Risk Resolution Deadline",
-            "description" : "The date/time by which the risk must be resolved.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remediations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" : 
-          { "title" : "Risk Log",
-            "description" : "A log of all risk-related tasks taken.",
-            "type" : "object",
-            "properties" : 
-            { "entries" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Risk Log Entry",
-                  "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Risk Log Entry Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "title" : 
-                    { "title" : "Title",
-                      "description" : "The title for this risk log entry.",
-                      "type" : "string" },
-                    "description" : 
-                    { "title" : "Risk Task Description",
-                      "description" : "A human-readable description of what was done regarding the risk.",
-                      "type" : "string" },
-                    "start" : 
-                    { "title" : "Start",
-                      "description" : "Identifies the start date and time of the event.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "end" : 
-                    { "title" : "End",
-                      "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" : 
-                    { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "title" : "Risk Response Reference",
-                        "description" : "Identifies an individual risk response that this log entry is for.",
-                        "type" : "object",
-                        "properties" : 
-                        { "response-uuid" : 
-                          { "title" : "Response Universally Unique Identifier Reference",
-                            "description" : "A machine-oriented identifier reference to a unique risk response.",
-                            "$ref" : "#/definitions/UUIDDatatype" },
-                          "props" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" : 
-                          { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" : 
-                        [ "response-uuid" ],
-                        "additionalProperties" : false } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "start" ],
-                  "additionalProperties" : false } } },
-            "required" : 
-            [ "entries" ],
-            "additionalProperties" : false },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "statement",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:logged-by" : 
-      { "title" : "Logged By",
-        "description" : "Used to indicate who created a log entry in what role.",
-        "$id" : "#assembly_oscal-assessment-common_logged-by",
-        "type" : "object",
-        "properties" : 
-        { "party-uuid" : 
-          { "title" : "Party UUID Reference",
-            "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "A point to the role-id of the role in which the party is making the log entry.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "party-uuid" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:risk-status" : 
-      { "title" : "Risk Status",
-        "description" : "Describes the status of the associated risk.",
-        "$id" : "#field_oscal-assessment-common_risk-status",
-        "anyOf" : 
-        [ 
-          { "$ref" : "#/definitions/TokenDatatype" },
-          
-          { "enum" : 
-            [ "open",
-              "investigating",
-              "remediating",
-              "deviation-requested",
-              "deviation-approved",
-              "closed" ] } ] },
-      "oscal-complete-oscal-assessment-common:characterization" : 
-      { "title" : "Characterization",
-        "description" : "A collection of descriptive data about the containing object from a specific origin.",
-        "$id" : "#assembly_oscal-assessment-common_characterization",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" : 
-          { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Facet",
-              "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
-              "type" : "object",
-              "properties" : 
-              { "name" : 
-                { "title" : "Facet Name",
-                  "description" : "The name of the risk metric within the specified system.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "system" : 
-                { "title" : "Naming System",
-                  "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://fedramp.gov",
-                        "http://fedramp.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal/unknown",
-                        "http://cve.mitre.org",
-                        "http://www.first.org/cvss/v2.0",
-                        "http://www.first.org/cvss/v3.0",
-                        "http://www.first.org/cvss/v3.1" ] } ] },
-                "value" : 
-                { "title" : "Facet Value",
-                  "description" : "Indicates the value of the facet.",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "name",
-                "system",
-                "value" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "origin",
-          "facets" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:response" : 
-      { "title" : "Risk Response",
-        "description" : "Describes either recommended or an actual plan for addressing the risk.",
-        "$id" : "#assembly_oscal-assessment-common_response",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Remediation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "lifecycle" : 
-          { "title" : "Remediation Intent",
-            "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "recommendation",
-                  "planned",
-                  "completed" ] } ] },
-          "title" : 
-          { "title" : "Response Title",
-            "description" : "The title for this response activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Response Description",
-            "description" : "A human-readable description of this response plan.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Required Asset",
-              "description" : "Identifies an asset required to achieve remediation.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Required Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" : 
-                { "title" : "Title for Required Asset",
-                  "description" : "The title for this required asset.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Description of Required Asset",
-                  "description" : "A human-readable description of this required asset.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "lifecycle",
-          "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-assessment-common:assessment-part" : 
-      { "title" : "Assessment Part",
-        "description" : "A partition of an assessment plan or results or a child of another part.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-part",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Part Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "anyOf" : 
+             { "$ref" : "#/definitions/TokenDatatype" },
+             
+             { "enum" : 
+              [ "param",
+               "prop",
+               "link",
+               "part",
+               "mapping",
+               "map" ] } ] },
+           "by-ns" : 
+           { "title" : "Item Namespace Reference",
+            "description" : "Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.",
+            "$ref" : "#/definitions/TokenDatatype" } },
+          "additionalProperties" : false } },
+        "adds" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Addition",
+          "description" : "Specifies contents to be added into controls, in resolution.",
+          "type" : "object",
+          "properties" : 
+          { "position" : 
+           { "title" : "Position",
+            "description" : "Where to add the new content with respect to the targeted element (beside it or inside it).",
+            "allOf" : 
             [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "asset",
-                  "method",
-                  "objective" ] } ] },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
+             { "$ref" : "#/definitions/TokenDatatype" },
+             
+             { "enum" : 
+              [ "before",
+               "after",
+               "starting",
+               "ending" ] } ] },
+           "by-id" : 
+           { "title" : "Reference by ID",
+            "description" : "Target location of the addition.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
+           "title" : 
+           { "title" : "Title Change",
+            "description" : "A name given to the control, which may be used by a tool for display and navigation.",
             "type" : "string" },
-          "parts" : 
-          { "type" : "array",
+           "params" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" : 
-          { "type" : "array",
+            { "$ref" : "#assembly_oscal-control-common_parameter" } },
+           "props" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ar:assessment-results" : 
-      { "title" : "Security Assessment Results (SAR)",
-        "description" : "Security assessment results, such as those provided by a FedRAMP assessor in the FedRAMP Security Assessment Report.",
-        "$id" : "#assembly_oscal-ar_assessment-results",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Results Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ap" : 
-          { "$ref" : "#assembly_oscal-ar_import-ap" },
-          "local-definitions" : 
-          { "title" : "Local Definitions",
-            "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
-            "type" : "object",
-            "properties" : 
-            { "objectives-and-methods" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
-              "activities" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_activity" } },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "additionalProperties" : false },
-          "results" : 
-          { "type" : "array",
+            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "links" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-ar_result" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "import-ap",
-          "results" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ar:result" : 
-      { "title" : "Assessment Result",
-        "description" : "Used by the assessment results and POA&M. In the assessment results, this identifies all of the assessment observations and findings, initial and residual risks, deviations, and disposition. In the POA&M, this identifies initial and residual risks, deviations, and disposition.",
-        "$id" : "#assembly_oscal-ar_result",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Results Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Results Title",
-            "description" : "The title for this set of results.",
-            "type" : "string" },
+            { "$ref" : "#assembly_oscal-metadata_link" } },
+           "parts" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#assembly_oscal-control-common_part" } } },
+          "additionalProperties" : false } } },
+       "required" : 
+       [ "control-id" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:insert-controls" : 
+   { "title" : "Insert Controls",
+    "description" : "Specifies which controls to use in the containing context.",
+    "$id" : "#assembly_oscal-profile_insert-controls",
+    "type" : "object",
+    "properties" : 
+    { "order" : 
+     { "title" : "Order",
+      "description" : "A designation of how a selection of controls in a profile is to be ordered.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "keep",
+         "ascending",
+         "descending" ] } ] },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
+     "exclude-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:select-control-by-id" : 
+   { "title" : "Select Control",
+    "description" : "Select a control or controls from an imported control set.",
+    "$id" : "#assembly_oscal-profile_select-control-by-id",
+    "type" : "object",
+    "properties" : 
+    { "with-child-controls" : 
+     { "title" : "Include Contained Controls with Control",
+      "description" : "When a control is included, whether its child (dependent) controls are also included.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "yes",
+         "no" ] } ] },
+     "with-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-profile_with-id" } },
+     "matching" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_matching" } } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-profile:with-id" : 
+   { "title" : "Match Controls by Identifier",
+    "description" : "Selecting a control by its ID given as a literal.",
+    "$id" : "#field_oscal-profile_with-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-complete-oscal-profile:matching" : 
+   { "title" : "Match Controls by Pattern",
+    "description" : "Selecting a set of controls by matching their IDs with a wildcard pattern.",
+    "$id" : "#assembly_oscal-profile_matching",
+    "type" : "object",
+    "properties" : 
+    { "pattern" : 
+     { "title" : "Pattern",
+      "description" : "A glob expression matching the IDs of one or more controls to be selected.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:component-definition" : 
+   { "title" : "Component Definition",
+    "description" : "A collection of component descriptions, which may optionally be grouped by capability.",
+    "$id" : "#assembly_oscal-component-definition_component-definition",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Definition Universally Unique Identifier",
+      "description" : "Provides a globally unique means to identify a given component definition instance.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-component-definitions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_import-component-definition" } },
+     "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_defined-component" } },
+     "capabilities" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_capability" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:import-component-definition" : 
+   { "title" : "Import Component Definition",
+    "description" : "Loads a component definition from another resource.",
+    "$id" : "#assembly_oscal-component-definition_import-component-definition",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hyperlink Reference",
+      "description" : "A link to a resource that defines a set of components and/or capabilities to import into this collection.",
+      "$ref" : "#/definitions/URIReferenceDatatype" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:defined-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-component-definition_defined-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "Provides a globally unique means to identify a given component.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "control-implementations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:capability" : 
+   { "title" : "Capability",
+    "description" : "A grouping of other components and/or capabilities.",
+    "$id" : "#assembly_oscal-component-definition_capability",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Capability Identifier",
+      "description" : "Provides a globally unique means to identify a given capability.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Capability Name",
+      "description" : "The capability's human-readable name.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "Capability Description",
+      "description" : "A summary of the capability.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "incorporates-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_incorporates-component" } },
+     "control-implementations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "name",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:incorporates-component" : 
+   { "title" : "Incorporates Component",
+    "description" : "The collection of components comprising this capability.",
+    "$id" : "#assembly_oscal-component-definition_incorporates-component",
+    "type" : "object",
+    "properties" : 
+    { "component-uuid" : 
+     { "title" : "Component Reference",
+      "description" : "A machine-oriented identifier reference to a component.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" } },
+    "required" : 
+    [ "component-uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:control-implementation" : 
+   { "title" : "Control Implementation Set",
+    "description" : "Defines how the component or capability supports a set of controls.",
+    "$id" : "#assembly_oscal-component-definition_control-implementation",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Control Implementation Set Identifier",
+      "description" : "Provides a means to identify a set of control implementations that are supported by a given component or capability.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "source" : 
+     { "title" : "Source Resource Reference",
+      "description" : "A reference to an OSCAL catalog or profile providing the referenced control or subcontrol definition.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "A description of how the specified set of controls are implemented for the containing component or capability.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "implemented-requirements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_implemented-requirement" } } },
+    "required" : 
+    [ "uuid",
+     "source",
+     "description",
+     "implemented-requirements" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:implemented-requirement" : 
+   { "title" : "Control Implementation",
+    "description" : "Describes how the containing component or capability implements an individual control.",
+    "$id" : "#assembly_oscal-component-definition_implemented-requirement",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Control Implementation Identifier",
+      "description" : "Provides a globally unique means to identify a given control implementation by a component.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "A suggestion from the supplier (e.g., component vendor or author) for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "statements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_statement" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "control-id",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-component-definition:statement" : 
+   { "title" : "Control Statement Implementation",
+    "description" : "Identifies which statements within a control are addressed.",
+    "$id" : "#assembly_oscal-component-definition_statement",
+    "type" : "object",
+    "properties" : 
+    { "statement-id" : 
+     { "title" : "Control Statement Reference",
+      "description" : "A human-oriented identifier reference to a control statement.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Control Statement Reference Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Statement Implementation Description",
+      "description" : "A summary of how the containing control statement is implemented by the component or capability.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "statement-id",
+     "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:system-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-implementation-common_system-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "this-system",
+         "system",
+         "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation",
+         "network" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the system component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Status",
+      "description" : "Describes the operational status of the system component.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "State",
+        "description" : "The operational status.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "under-development",
+           "operational",
+           "disposition",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:protocol" : 
+   { "title" : "Service Protocol Information",
+    "description" : "Information about the protocol used to provide a service.",
+    "$id" : "#assembly_oscal-implementation-common_protocol",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Service Protocol Information Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Protocol Name",
+      "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "title" : 
+     { "title" : "Protocol Title",
+      "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
+      "type" : "string" },
+     "port-ranges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:port-range" : 
+   { "title" : "Port Range",
+    "description" : "Where applicable this is the IPv4 port range on which the service operates.",
+    "$id" : "#assembly_oscal-implementation-common_port-range",
+    "type" : "object",
+    "properties" : 
+    { "start" : 
+     { "title" : "Start",
+      "description" : "Indicates the starting port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "end" : 
+     { "title" : "End",
+      "description" : "Indicates the ending port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "transport" : 
+     { "title" : "Transport",
+      "description" : "Indicates the transport type.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "TCP",
+         "UDP" ] } ] } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:implementation-status" : 
+   { "title" : "Implementation Status",
+    "description" : "Indicates the degree to which the a given control is implemented.",
+    "$id" : "#assembly_oscal-implementation-common_implementation-status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "Implementation State",
+      "description" : "Identifies the implementation status of the control or control objective.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "implemented",
+         "partial",
+         "planned",
+         "alternative",
+         "not-applicable" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:system-user" : 
+   { "title" : "System User",
+    "description" : "A type of user that interacts with the system based on an associated role.",
+    "$id" : "#assembly_oscal-implementation-common_system-user",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "User Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "User Title",
+      "description" : "A name given to the user, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "short-name" : 
+     { "title" : "User Short Name",
+      "description" : "A short common name, abbreviation, or acronym for the user.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "User Description",
+      "description" : "A summary of the user's purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "role-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_role-id" } },
+     "authorized-privileges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:authorized-privilege" : 
+   { "title" : "Privilege",
+    "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
+    "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Privilege Title",
+      "description" : "A human readable name for the privilege.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Privilege Description",
+      "description" : "A summary of the privilege's purpose within the system.",
+      "type" : "string" },
+     "functions-performed" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
+    "required" : 
+    [ "title",
+     "functions-performed" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:function-performed" : 
+   { "title" : "Functions Performed",
+    "description" : "Describes a function performed for a given authorized privilege by this user class.",
+    "$id" : "#field_oscal-implementation-common_function-performed",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-implementation-common:inventory-item" : 
+   { "title" : "Inventory Item",
+    "description" : "A single managed inventory item within the system.",
+    "$id" : "#assembly_oscal-implementation-common_inventory-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Inventory Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Inventory Item Description",
+      "description" : "A summary of the inventory item stating its purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "implemented-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Implemented Component",
+       "description" : "The set of components that are implemented in a given system inventory item.",
+       "type" : "object",
+       "properties" : 
+       { "component-uuid" : 
+        { "title" : "Component Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "component-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:set-parameter" : 
+   { "title" : "Set Parameter Value",
+    "description" : "Identifies the parameter that will be set by the enclosed value.",
+    "$id" : "#assembly_oscal-implementation-common_set-parameter",
+    "type" : "object",
+    "properties" : 
+    { "param-id" : 
+     { "title" : "Parameter ID",
+      "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Value",
+       "description" : "A parameter value or set of values.",
+       "$ref" : "#/definitions/StringDatatype" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "param-id",
+     "values" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-implementation-common:system-id" : 
+   { "title" : "System Identification",
+    "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
+    "$id" : "#field_oscal-implementation-common_system-id",
+    "type" : "object",
+    "properties" : 
+    { "identifier-type" : 
+     { "title" : "Identification System Type",
+      "description" : "Identifies the identification system from which the provided identifier was assigned.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "https://fedramp.gov",
+         "http://fedramp.gov/ns/oscal",
+         "https://ietf.org/rfc/rfc4122",
+         "http://ietf.org/rfc/rfc4122" ] } ] },
+     "id" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:system-security-plan" : 
+   { "title" : "System Security Plan (SSP)",
+    "description" : "A system security plan, such as those described in NIST SP 800-18.",
+    "$id" : "#assembly_oscal-ssp_system-security-plan",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "System Security Plan Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-profile" : 
+     { "$ref" : "#assembly_oscal-ssp_import-profile" },
+     "system-characteristics" : 
+     { "$ref" : "#assembly_oscal-ssp_system-characteristics" },
+     "system-implementation" : 
+     { "$ref" : "#assembly_oscal-ssp_system-implementation" },
+     "control-implementation" : 
+     { "$ref" : "#assembly_oscal-ssp_control-implementation" },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "import-profile",
+     "system-characteristics",
+     "system-implementation",
+     "control-implementation" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:import-profile" : 
+   { "title" : "Import Profile",
+    "description" : "Used to import the OSCAL profile representing the system's control baseline.",
+    "$id" : "#assembly_oscal-ssp_import-profile",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Profile Reference",
+      "description" : "A resolvable URL reference to the profile or catalog to use as the system's control baseline.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:system-characteristics" : 
+   { "title" : "System Characteristics",
+    "description" : "Contains the characteristics of the system, such as its name, purpose, and security impact level.",
+    "$id" : "#assembly_oscal-ssp_system-characteristics",
+    "type" : "object",
+    "properties" : 
+    { "system-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_system-id" } },
+     "system-name" : 
+     { "title" : "System Name - Full",
+      "description" : "The full name of the system.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "system-name-short" : 
+     { "title" : "System Name - Short",
+      "description" : "A short name for the system, such as an acronym, that is suitable for display in a data table or summary list.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "System Description",
+      "description" : "A summary of the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "date-authorized" : 
+     { "$ref" : "#field_oscal-ssp_date-authorized" },
+     "security-sensitivity-level" : 
+     { "title" : "Security Sensitivity Level",
+      "description" : "The overall information system sensitivity categorization, such as defined by FIPS-199.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "system-information" : 
+     { "$ref" : "#assembly_oscal-ssp_system-information" },
+     "security-impact-level" : 
+     { "$ref" : "#assembly_oscal-ssp_security-impact-level" },
+     "status" : 
+     { "$ref" : "#assembly_oscal-ssp_status" },
+     "authorization-boundary" : 
+     { "$ref" : "#assembly_oscal-ssp_authorization-boundary" },
+     "network-architecture" : 
+     { "$ref" : "#assembly_oscal-ssp_network-architecture" },
+     "data-flow" : 
+     { "$ref" : "#assembly_oscal-ssp_data-flow" },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "system-ids",
+     "system-name",
+     "description",
+     "security-sensitivity-level",
+     "system-information",
+     "security-impact-level",
+     "status",
+     "authorization-boundary" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:system-information" : 
+   { "title" : "System Information",
+    "description" : "Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
+    "$id" : "#assembly_oscal-ssp_system-information",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "information-types" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Information Type",
+       "description" : "Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Information Type Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "title field",
+         "description" : "A human readable name for the information type. This title should be meaningful within the context of the system.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Information Type Description",
+         "description" : "A summary of how this information type is used within the system.",
+         "type" : "string" },
+        "categorizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Information Type Categorization",
+          "description" : "A set of information type identifiers qualified by the given identification system used, such as NIST SP 800-60.",
+          "type" : "object",
+          "properties" : 
+          { "system" : 
+           { "title" : "Information Type Identification System",
+            "description" : "Specifies the information type identification system used.",
+            "anyOf" : 
+            [ 
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://doi.org/10.6028/NIST.SP.800-60v2r1" ] } ] },
+           "information-type-ids" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "title" : "Information Type Systematized Identifier",
+             "description" : "A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+             "$ref" : "#/definitions/StringDatatype" } } },
+          "required" : 
+          [ "system" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "confidentiality-impact" : 
+        { "$ref" : "#assembly_oscal-ssp_impact" },
+        "integrity-impact" : 
+        { "$ref" : "#assembly_oscal-ssp_impact" },
+        "availability-impact" : 
+        { "$ref" : "#assembly_oscal-ssp_impact" } },
+       "required" : 
+       [ "title",
+        "description" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "information-types" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:impact" : 
+   { "title" : "Impact Level",
+    "description" : "The expected level of impact resulting from the described information.",
+    "$id" : "#assembly_oscal-ssp_impact",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "base" : 
+     { "$ref" : "#field_oscal-ssp_base" },
+     "selected" : 
+     { "$ref" : "#field_oscal-ssp_selected" },
+     "adjustment-justification" : 
+     { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
+    "required" : 
+    [ "base" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:base" : 
+   { "title" : "Base Level (Confidentiality, Integrity, or Availability)",
+    "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.",
+    "$id" : "#field_oscal-ssp_base",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-ssp:selected" : 
+   { "title" : "Selected Level (Confidentiality, Integrity, or Availability)",
+    "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.",
+    "$id" : "#field_oscal-ssp_selected",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-complete-oscal-ssp:adjustment-justification" : 
+   { "title" : "Adjustment Justification",
+    "description" : "If the selected security level is different from the base security level, this contains the justification for the change.",
+    "$id" : "#field_oscal-ssp_adjustment-justification",
+    "type" : "string" },
+   "oscal-complete-oscal-ssp:security-impact-level" : 
+   { "title" : "Security Impact Level",
+    "description" : "The overall level of expected impact resulting from unauthorized disclosure, modification, or loss of access to information.",
+    "$id" : "#assembly_oscal-ssp_security-impact-level",
+    "type" : "object",
+    "properties" : 
+    { "security-objective-confidentiality" : 
+     { "title" : "Security Objective: Confidentiality",
+      "description" : "A target-level of confidentiality for the system, based on the sensitivity of information within the system.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "security-objective-integrity" : 
+     { "title" : "Security Objective: Integrity",
+      "description" : "A target-level of integrity for the system, based on the sensitivity of information within the system.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "security-objective-availability" : 
+     { "title" : "Security Objective: Availability",
+      "description" : "A target-level of availability for the system, based on the sensitivity of information within the system.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "security-objective-confidentiality",
+     "security-objective-integrity",
+     "security-objective-availability" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:status" : 
+   { "title" : "Status",
+    "description" : "Describes the operational status of the system.",
+    "$id" : "#assembly_oscal-ssp_status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "State",
+      "description" : "The current operating status.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "operational",
+         "under-development",
+         "under-major-modification",
+         "disposition",
+         "other" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:date-authorized" : 
+   { "title" : "System Authorization Date",
+    "description" : "The date the system received its authorization.",
+    "$id" : "#field_oscal-ssp_date-authorized",
+    "$ref" : "#/definitions/DateDatatype" },
+   "oscal-complete-oscal-ssp:authorization-boundary" : 
+   { "title" : "Authorization Boundary",
+    "description" : "A description of this system's authorization boundary, optionally supplemented by diagrams that illustrate the authorization boundary.",
+    "$id" : "#assembly_oscal-ssp_authorization-boundary",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Authorization Boundary Description",
+      "description" : "A summary of the system's authorization boundary.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "diagrams" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_diagram" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:diagram" : 
+   { "title" : "Diagram",
+    "description" : "A graphic that provides a visual representation the system, or some aspect of it.",
+    "$id" : "#assembly_oscal-ssp_diagram",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Diagram ID",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Diagram Description",
+      "description" : "A summary of the diagram.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "caption" : 
+     { "title" : "Caption",
+      "description" : "A brief caption to annotate the diagram.",
+      "type" : "string" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:network-architecture" : 
+   { "title" : "Network Architecture",
+    "description" : "A description of the system's network architecture, optionally supplemented by diagrams that illustrate the network architecture.",
+    "$id" : "#assembly_oscal-ssp_network-architecture",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Network Architecture Description",
+      "description" : "A summary of the system's network architecture.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "diagrams" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_diagram" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:data-flow" : 
+   { "title" : "Data Flow",
+    "description" : "A description of the logical flow of information within the system and across its boundaries, optionally supplemented by diagrams that illustrate these flows.",
+    "$id" : "#assembly_oscal-ssp_data-flow",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Data Flow Description",
+      "description" : "A summary of the system's data flow.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "diagrams" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_diagram" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:system-implementation" : 
+   { "title" : "System Implementation",
+    "description" : "Provides information as to how the system is implemented.",
+    "$id" : "#assembly_oscal-ssp_system-implementation",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "leveraged-authorizations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Leveraged Authorization",
+       "description" : "A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Leveraged Authorization Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "title field",
+         "description" : "A human readable name for the leveraged authorization in the context of the system.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "party-uuid" : 
+        { "title" : "party-uuid field",
+         "description" : "A machine-oriented identifier reference to the party that manages the leveraged system.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "date-authorized" : 
+        { "$ref" : "#field_oscal-ssp_date-authorized" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "title",
+        "party-uuid",
+        "date-authorized" ],
+       "additionalProperties" : false } },
+     "users" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
+     "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "inventory-items" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "users",
+     "components" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:control-implementation" : 
+   { "title" : "Control Implementation",
+    "description" : "Describes how the system satisfies a set of controls.",
+    "$id" : "#assembly_oscal-ssp_control-implementation",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "A statement describing important things to know about how this set of control satisfaction documentation is approached.",
+      "type" : "string" },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "implemented-requirements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_implemented-requirement" } } },
+    "required" : 
+    [ "description",
+     "implemented-requirements" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:implemented-requirement" : 
+   { "title" : "Control-based Requirement",
+    "description" : "Describes how the system satisfies the requirements of an individual control.",
+    "$id" : "#assembly_oscal-ssp_implemented-requirement",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Control Requirement Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "statements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_statement" } },
+     "by-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_by-component" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "control-id" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:statement" : 
+   { "title" : "Specific Control Statement",
+    "description" : "Identifies which statements within a control are addressed.",
+    "$id" : "#assembly_oscal-ssp_statement",
+    "type" : "object",
+    "properties" : 
+    { "statement-id" : 
+     { "title" : "Control Statement Reference",
+      "description" : "A human-oriented identifier reference to a control statement.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Control Statement Reference Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "by-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_by-component" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "statement-id",
+     "uuid" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ssp:by-component" : 
+   { "title" : "Component Control Implementation",
+    "description" : "Defines how the referenced component implements a set of controls.",
+    "$id" : "#assembly_oscal-ssp_by-component",
+    "type" : "object",
+    "properties" : 
+    { "component-uuid" : 
+     { "title" : "Component Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to the component that is implemeting a given control.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "uuid" : 
+     { "title" : "By-Component Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "An implementation statement that describes how a control or a control statement is implemented within the referenced system component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "implementation-status" : 
+     { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
+     "export" : 
+     { "title" : "Export",
+      "description" : "Identifies content intended for external consumption, such as with leveraged organizations.",
+      "type" : "object",
+      "properties" : 
+      { "description" : 
+       { "title" : "Control Implementation Export Description",
+        "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be available to another system leveraging this system.",
+        "type" : "string" },
+       "props" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-metadata_property" } },
+       "links" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-metadata_link" } },
+       "provided" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Provided Control Implementation",
+         "description" : "Describes a capability which may be inherited by a leveraging system.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Provided Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "description" : 
-          { "title" : "Results Description",
-            "description" : "A human-readable description of this set of test results.",
-            "type" : "string" },
-          "start" : 
-          { "title" : "start field",
-            "description" : "Date/time stamp identifying the start of the evidence collection reflected in these results.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "end" : 
-          { "title" : "end field",
-            "description" : "Date/time stamp identifying the end of the evidence collection reflected in these results. In a continuous motoring scenario, this may contain the same value as start if appropriate.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          { "title" : "Provided Control Implementation Description",
+           "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be provided to another system leveraging this system.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "local-definitions" : 
-          { "title" : "Local Definitions",
-            "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
-            "type" : "object",
-            "properties" : 
-            { "components" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-              "inventory-items" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-              "users" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-              "assessment-assets" : 
-              { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
-              "tasks" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_task" } } },
-            "additionalProperties" : false },
-          "reviewed-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "attestations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Attestation Statements",
-              "description" : "A set of textual statements, typically written by the assessor.",
-              "type" : "object",
-              "properties" : 
-              { "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "parts" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
-              "required" : 
-              [ "parts" ],
-              "additionalProperties" : false } },
-          "assessment-log" : 
-          { "title" : "Assessment Log",
-            "description" : "A log of all assessment-related actions taken.",
-            "type" : "object",
-            "properties" : 
-            { "entries" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Assessment Log Entry",
-                  "description" : "Identifies the result of an action and/or task that occurred as part of executing an assessment plan or an assessment event that occurred in producing the assessment results.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Assessment Log Entry Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "title" : 
-                    { "title" : "Action Title",
-                      "description" : "The title for this event.",
-                      "type" : "string" },
-                    "description" : 
-                    { "title" : "Action Description",
-                      "description" : "A human-readable description of this event.",
-                      "type" : "string" },
-                    "start" : 
-                    { "title" : "Start",
-                      "description" : "Identifies the start date and time of an event.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "end" : 
-                    { "title" : "End",
-                      "description" : "Identifies the end date and time of an event. If the event is a point in time, the start and end will be the same date and time.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "related-tasks" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "start" ],
-                  "additionalProperties" : false } } },
-            "required" : 
-            [ "entries" ],
-            "additionalProperties" : false },
-          "observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "findings" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "responsible-roles" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ar_finding" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "start",
-          "reviewed-controls" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-ar:finding" : 
-      { "title" : "Finding",
-        "description" : "Describes an individual finding.",
-        "$id" : "#assembly_oscal-ar_finding",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Finding Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Finding Title",
-            "description" : "The title for this finding.",
-            "type" : "string" },
+         "required" : 
+         [ "uuid",
+          "description" ],
+         "additionalProperties" : false } },
+       "responsibilities" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Control Implementation Responsibility",
+         "description" : "Describes a control implementation responsibility imposed on a leveraging system.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Responsibility Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
+          "provided-uuid" : 
+          { "title" : "Provided UUID",
+           "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "description" : 
-          { "title" : "Finding Description",
-            "description" : "A human-readable description of this finding.",
-            "type" : "string" },
+          { "title" : "Control Implementation Responsibility Description",
+           "description" : "An implementation statement that describes the aspects of the control or control statement implementation that a leveraging system must implement to satisfy the control provided by a leveraged system.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "target" : 
-          { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
-          "implementation-statement-uuid" : 
-          { "title" : "Implementation Statement UUID",
-            "description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } },
-          "related-risks" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "responsible-roles" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Risk",
-              "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "risk-uuid" : 
-                { "title" : "Risk Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "risk-uuid" ],
-              "additionalProperties" : false } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
+         "required" : 
+         [ "uuid",
+          "description" ],
+         "additionalProperties" : false } },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "additionalProperties" : false },
+     "inherited" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Inherited Control Implementation",
+       "description" : "Describes a control implementation inherited by a leveraging system.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Inherited Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "provided-uuid" : 
+        { "title" : "Provided UUID",
+         "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Inherited Control Implementation Description",
+         "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is inheriting from a leveraged system.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "satisfied" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Satisfied Control Implementation Responsibility",
+       "description" : "Describes how this system satisfies a responsibility imposed by a leveraged system.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Satisfied Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "responsibility-uuid" : 
+        { "title" : "Responsibility UUID",
+         "description" : "A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Satisfied Control Implementation Responsibility Description",
+         "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is implementing based on a requirement from a leveraged system.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "component-uuid",
+     "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ap:assessment-plan" : 
+   { "title" : "Security Assessment Plan (SAP)",
+    "description" : "An assessment plan, such as those provided by a FedRAMP assessor.",
+    "$id" : "#assembly_oscal-ap_assessment-plan",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Plan Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-ssp" : 
+     { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
+     "local-definitions" : 
+     { "title" : "Local Definitions",
+      "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
+      "type" : "object",
+      "properties" : 
+      { "components" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+       "inventory-items" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+       "users" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
+       "objectives-and-methods" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
+       "activities" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_activity" } },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "additionalProperties" : false },
+     "terms-and-conditions" : 
+     { "title" : "Assessment Plan Terms and Conditions",
+      "description" : "Used to define various terms and conditions under which an assessment, described by the plan, can be performed. Each child part defines a different type of term or condition.",
+      "type" : "object",
+      "properties" : 
+      { "parts" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
+      "additionalProperties" : false },
+     "reviewed-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "assessment-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "assessment-assets" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "import-ssp",
+     "reviewed-controls" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:import-ssp" : 
+   { "title" : "Import System Security Plan",
+    "description" : "Used by the assessment plan and POA&M to import information about the system.",
+    "$id" : "#assembly_oscal-assessment-common_import-ssp",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "System Security Plan Reference",
+      "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:local-objective" : 
+   { "title" : "Assessment-Specific Control Objective",
+    "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_local-objective",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "description" : 
+     { "title" : "Objective Description",
+      "description" : "A human-readable description of this control objective.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-id",
+     "parts" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:assessment-method" : 
+   { "title" : "Assessment Method",
+    "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-method",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Method Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Method Description",
+      "description" : "A human-readable description of this assessment method.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "part" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "part" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:activity" : 
+   { "title" : "Activity",
+    "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
+    "$id" : "#assembly_oscal-assessment-common_activity",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Activity Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Included Activity Title",
+      "description" : "The title for this included activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Included Activity Description",
+      "description" : "A human-readable description of this included activity.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "steps" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Step",
+       "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Step Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Step Title",
+         "description" : "The title for this step.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Step Description",
+         "description" : "A human-readable description of this step.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "reviewed-controls" : 
+        { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "related-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:task" : 
+   { "title" : "Task",
+    "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_task",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Task Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Task Type",
+      "description" : "The type of task.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "milestone",
+         "action" ] } ] },
+     "title" : 
+     { "title" : "Task Title",
+      "description" : "The title for this task.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Task Description",
+      "description" : "A human-readable description of this task.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "timing" : 
+     { "title" : "Event Timing",
+      "description" : "The timing under which the task is intended to occur.",
+      "type" : "object",
+      "properties" : 
+      { "on-date" : 
+       { "title" : "On Date Condition",
+        "description" : "The task is intended to occur on the specified date.",
+        "type" : "object",
+        "properties" : 
+        { "date" : 
+         { "title" : "On Date Condition",
+          "description" : "The task must occur on the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "target" ],
+        [ "date" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-ar:import-ap" : 
-      { "title" : "Import Assessment Plan",
-        "description" : "Used by assessment-results to import information about the original plan for assessing the system.",
-        "$id" : "#assembly_oscal-ar_import-ap",
+       "within-date-range" : 
+       { "title" : "On Date Range Condition",
+        "description" : "The task is intended to occur within the specified date range.",
         "type" : "object",
         "properties" : 
-        { "href" : 
-          { "title" : "Assessment Plan Reference",
-            "description" : "A resolvable URL reference to the assessment plan governing the assessment activities.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
+        { "start" : 
+         { "title" : "Start Date Condition",
+          "description" : "The task must occur on or after the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+         "end" : 
+         { "title" : "End Date Condition",
+          "description" : "The task must occur on or before the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "href" ],
+        [ "start",
+         "end" ],
         "additionalProperties" : false },
-      "oscal-complete-oscal-poam:plan-of-action-and-milestones" : 
-      { "title" : "Plan of Action and Milestones (POA&M)",
-        "description" : "A plan of action and milestones which identifies initial and residual risks, deviations, and disposition, such as those required by FedRAMP.",
-        "$id" : "#assembly_oscal-poam_plan-of-action-and-milestones",
+       "at-frequency" : 
+       { "title" : "Frequency Condition",
+        "description" : "The task is intended to occur at the specified frequency.",
         "type" : "object",
         "properties" : 
-        { "uuid" : 
-          { "title" : "POA&M Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+        { "period" : 
+         { "title" : "Period",
+          "description" : "The task must occur after the specified period has elapsed.",
+          "$ref" : "#/definitions/PositiveIntegerDatatype" },
+         "unit" : 
+         { "title" : "Time Unit",
+          "description" : "The unit of time for the period.",
+          "allOf" : 
+          [ 
+           { "$ref" : "#/definitions/StringDatatype" },
+           
+           { "enum" : 
+            [ "seconds",
+             "minutes",
+             "hours",
+             "days",
+             "months",
+             "years" ] } ] } },
+        "required" : 
+        [ "period",
+         "unit" ],
+        "additionalProperties" : false } },
+      "additionalProperties" : false },
+     "dependencies" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Task Dependency",
+       "description" : "Used to indicate that a task is dependent on another task.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a unique task.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "associated-activities" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Activity",
+       "description" : "Identifies an individual activity to be performed as part of a task.",
+       "type" : "object",
+       "properties" : 
+       { "activity-uuid" : 
+        { "title" : "Activity Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "activity-uuid",
+        "subjects" ],
+       "additionalProperties" : false } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:reviewed-controls" : 
+   { "title" : "Reviewed Controls and Control Objectives",
+    "description" : "Identifies the controls being assessed and their control objectives.",
+    "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Control Objective Description",
+      "description" : "A human-readable description of control objectives.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "control-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessed Controls",
+       "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Assessed Controls Description",
+         "description" : "A human-readable description of in-scope controls specified for assessment.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "exclude-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "control-objective-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Referenced Control Objectives",
+       "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Control Objectives Description",
+         "description" : "A human-readable description of this collection of control objectives.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "exclude-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-selections" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:select-control-by-id" : 
+   { "title" : "Select Control",
+    "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
+    "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "statement-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Include Specific Statements",
+       "description" : "Used to constrain the selection to only specificity identified statements.",
+       "$ref" : "#/definitions/TokenDatatype" } } },
+    "required" : 
+    [ "control-id" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:select-objective-by-id" : 
+   { "title" : "Select Objective",
+    "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
+    "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
+    "type" : "object",
+    "properties" : 
+    { "objective-id" : 
+     { "title" : "Objective ID",
+      "description" : "Points to an assessment objective.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "objective-id" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:assessment-subject-placeholder" : 
+   { "title" : "Assessment Subject Placeholder",
+    "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Subject Placeholder Description",
+      "description" : "A human-readable description of intent of this assessment subject placeholder.",
+      "type" : "string" },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Subject Source",
+       "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "sources" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:assessment-subject" : 
+   { "title" : "Subject of Assessment",
+    "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user" ] } ] },
+     "description" : 
+     { "title" : "Include Subjects Description",
+      "description" : "A human-readable description of the collection of subjects being included in this assessment.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "exclude-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:select-subject-by-id" : 
+   { "title" : "Select Assessment Subject",
+    "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
+    "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:subject-reference" : 
+   { "title" : "Identifies the Subject",
+    "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
+    "$id" : "#assembly_oscal-assessment-common_subject-reference",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "title" : 
+     { "title" : "Subject Reference Title",
+      "description" : "The title or name for the referenced subject.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:assessment-assets" : 
+   { "title" : "Assessment Assets",
+    "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-assets",
+    "type" : "object",
+    "properties" : 
+    { "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "assessment-platforms" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Platform",
+       "description" : "Used to represent the toolset used to perform aspects of the assessment.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Assessment Platform Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Assessment Platform Title",
+         "description" : "The title or name for the assessment platform.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "uses-components" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Uses Component",
+          "description" : "The set of components that are used by the assessment platform.",
+          "type" : "object",
+          "properties" : 
+          { "component-uuid" : 
+           { "title" : "Component Universally Unique Identifier Reference",
+            "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
             "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" : 
-          { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "system-id" : 
-          { "$ref" : "#field_oscal-implementation-common_system-id" },
-          "local-definitions" : 
-          { "$ref" : "#assembly_oscal-poam_local-definitions" },
-          "observations" : 
-          { "type" : "array",
+           "props" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" : 
-          { "type" : "array",
+            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "links" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "poam-items" : 
-          { "type" : "array",
+            { "$ref" : "#assembly_oscal-metadata_link" } },
+           "responsible-parties" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-poam_poam-item" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "poam-items" ],
-        "additionalProperties" : false },
-      "oscal-complete-oscal-poam:local-definitions" : 
-      { "title" : "Local Definitions",
-        "description" : "Allows components, and inventory-items to be defined within the POA&M for circumstances where no OSCAL-based SSP exists, or is not delivered with the POA&M.",
-        "$id" : "#assembly_oscal-poam_local-definitions",
-        "type" : "object",
-        "properties" : 
-        { "components" : 
+            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+           "remarks" : 
+           { "$ref" : "#field_oscal-metadata_remarks" } },
+          "required" : 
+          [ "component-uuid" ],
+          "additionalProperties" : false } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "assessment-platforms" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:finding-target" : 
+   { "title" : "Objective Status",
+    "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
+    "$id" : "#assembly_oscal-assessment-common_finding-target",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Finding Target Type",
+      "description" : "Identifies the type of the target.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "statement-id",
+         "objective-id" ] } ] },
+     "target-id" : 
+     { "title" : "Finding Target Identifier Reference",
+      "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Objective Status Title",
+      "description" : "The title for this objective status.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Objective Status Description",
+      "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Objective Status",
+      "description" : "A determination of if the objective is satisfied or not within a given system.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "Objective Status State",
+        "description" : "An indication as to whether the objective is satisfied or not.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "satisfied",
+           "not-satisfied" ] } ] },
+       "reason" : 
+       { "title" : "Objective Status Reason",
+        "description" : "The reason the objective was given it's status.",
+        "anyOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "pass",
+           "fail",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "implementation-status" : 
+     { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "target-id",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:finding" : 
+   { "title" : "Finding",
+    "description" : "Describes an individual finding.",
+    "$id" : "#assembly_oscal-assessment-common_finding",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Finding Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Finding Title",
+      "description" : "The title for this finding.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Finding Description",
+      "description" : "A human-readable description of this finding.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "target" : 
+     { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
+     "implementation-statement-uuid" : 
+     { "title" : "Implementation Statement UUID",
+      "description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } },
+     "related-risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Risk",
+       "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "risk-uuid" : 
+        { "title" : "Risk Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "risk-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "target" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:observation" : 
+   { "title" : "Observation",
+    "description" : "Describes an individual observation.",
+    "$id" : "#assembly_oscal-assessment-common_observation",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Observation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Observation Title",
+      "description" : "The title for this observation.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Observation Description",
+      "description" : "A human-readable description of this assessment observation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "methods" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Method",
+       "description" : "Identifies how the observation was made.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/StringDatatype" },
+        
+        { "enum" : 
+         [ "EXAMINE",
+          "INTERVIEW",
+          "TEST",
+          "UNKNOWN" ] } ] } },
+     "types" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Type",
+       "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/TokenDatatype" },
+        
+        { "enum" : 
+         [ "ssp-statement-issue",
+          "control-objective",
+          "mitigation",
+          "finding",
+          "historic" ] } ] } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+     "relevant-evidence" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Relevant Evidence",
+       "description" : "Links this observation to relevant evidence.",
+       "type" : "object",
+       "properties" : 
+       { "href" : 
+        { "title" : "Relevant Evidence Reference",
+         "description" : "A resolvable URL reference to relevant evidence.",
+         "$ref" : "#/definitions/URIReferenceDatatype" },
+        "description" : 
+        { "title" : "Relevant Evidence Description",
+         "description" : "A human-readable description of this evidence.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "description" ],
+       "additionalProperties" : false } },
+     "collected" : 
+     { "title" : "Collected Field",
+      "description" : "Date/time stamp identifying when the finding information was collected.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "expires" : 
+     { "title" : "Expires Field",
+      "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description",
+     "methods",
+     "collected" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:origin" : 
+   { "title" : "Origin",
+    "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
+    "$id" : "#assembly_oscal-assessment-common_origin",
+    "type" : "object",
+    "properties" : 
+    { "actors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
+     "related-tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
+    "required" : 
+    [ "actors" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:origin-actor" : 
+   { "title" : "Originating Actor",
+    "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
+    "$id" : "#assembly_oscal-assessment-common_origin-actor",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Actor Type",
+      "description" : "The kind of actor.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "tool",
+         "assessment-platform",
+         "party" ] } ] },
+     "actor-uuid" : 
+     { "title" : "Actor Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "type",
+     "actor-uuid" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:related-task" : 
+   { "title" : "Task Reference",
+    "description" : "Identifies an individual task for which the containing object is a consequence of.",
+    "$id" : "#assembly_oscal-assessment-common_related-task",
+    "type" : "object",
+    "properties" : 
+    { "task-uuid" : 
+     { "title" : "Task Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a unique task.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "identified-subject" : 
+     { "title" : "Identified Subject",
+      "description" : "Used to detail assessment subjects that were identfied by this task.",
+      "type" : "object",
+      "properties" : 
+      { "subject-placeholder-uuid" : 
+       { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
+        "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
+        "$ref" : "#/definitions/UUIDDatatype" },
+       "subjects" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
+      "required" : 
+      [ "subject-placeholder-uuid",
+       "subjects" ],
+      "additionalProperties" : false },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "task-uuid" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:threat-id" : 
+   { "title" : "Threat ID",
+    "description" : "A pointer, by ID, to an externally-defined threat.",
+    "$id" : "#field_oscal-assessment-common_threat-id",
+    "type" : "object",
+    "properties" : 
+    { "system" : 
+     { "title" : "Threat Type Identification System",
+      "description" : "Specifies the source of the threat information.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://fedramp.gov",
+         "http://fedramp.gov/ns/oscal" ] } ] },
+     "href" : 
+     { "title" : "Threat Information Resource Reference",
+      "description" : "An optional location for the threat data, from which this ID originates.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "id" : 
+     { "$ref" : "#/definitions/URIDatatype" } },
+    "required" : 
+    [ "id",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:risk" : 
+   { "title" : "Identified Risk",
+    "description" : "An identified risk.",
+    "$id" : "#assembly_oscal-assessment-common_risk",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Risk Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Risk Title",
+      "description" : "The title for this risk.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Risk Description",
+      "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
+      "type" : "string" },
+     "statement" : 
+     { "title" : "Risk Statement",
+      "description" : "An summary of impact for how the risk affects the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "$ref" : "#field_oscal-assessment-common_risk-status" },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "threat-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-assessment-common_threat-id" } },
+     "characterizations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
+     "mitigating-factors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Mitigating Factor",
+       "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Mitigating Factor Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "implementation-uuid" : 
+        { "title" : "Implementation UUID",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Mitigating Factor Description",
+         "description" : "A human-readable description of this mitigating factor.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "deadline" : 
+     { "title" : "Risk Resolution Deadline",
+      "description" : "The date/time by which the risk must be resolved.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remediations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_response" } },
+     "risk-log" : 
+     { "title" : "Risk Log",
+      "description" : "A log of all risk-related tasks taken.",
+      "type" : "object",
+      "properties" : 
+      { "entries" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Risk Log Entry",
+         "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Risk Log Entry Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
+          "title" : 
+          { "title" : "Title",
+           "description" : "The title for this risk log entry.",
+           "type" : "string" },
+          "description" : 
+          { "title" : "Risk Task Description",
+           "description" : "A human-readable description of what was done regarding the risk.",
+           "type" : "string" },
+          "start" : 
+          { "title" : "Start",
+           "description" : "Identifies the start date and time of the event.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          "end" : 
+          { "title" : "End",
+           "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
+          "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "logged-by" : 
+          { "type" : "array",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
+          "status-change" : 
+          { "$ref" : "#field_oscal-assessment-common_risk-status" },
+          "related-responses" : 
+          { "type" : "array",
+           "minItems" : 1,
+           "items" : 
+           { "title" : "Risk Response Reference",
+            "description" : "Identifies an individual risk response that this log entry is for.",
+            "type" : "object",
+            "properties" : 
+            { "response-uuid" : 
+             { "title" : "Response Universally Unique Identifier Reference",
+              "description" : "A machine-oriented identifier reference to a unique risk response.",
+              "$ref" : "#/definitions/UUIDDatatype" },
+             "props" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_property" } },
+             "links" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_link" } },
+             "related-tasks" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
+             "remarks" : 
+             { "$ref" : "#field_oscal-metadata_remarks" } },
+            "required" : 
+            [ "response-uuid" ],
+            "additionalProperties" : false } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "additionalProperties" : false },
-      "oscal-complete-oscal-poam:poam-item" : 
-      { "title" : "POA&M Item",
-        "description" : "Describes an individual POA&M item.",
-        "$id" : "#assembly_oscal-poam_poam-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "POA&M Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
+         "required" : 
+         [ "uuid",
+          "start" ],
+         "additionalProperties" : false } } },
+      "required" : 
+      [ "entries" ],
+      "additionalProperties" : false },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "statement",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:logged-by" : 
+   { "title" : "Logged By",
+    "description" : "Used to indicate who created a log entry in what role.",
+    "$id" : "#assembly_oscal-assessment-common_logged-by",
+    "type" : "object",
+    "properties" : 
+    { "party-uuid" : 
+     { "title" : "Party UUID Reference",
+      "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "A point to the role-id of the role in which the party is making the log entry.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "party-uuid" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:risk-status" : 
+   { "title" : "Risk Status",
+    "description" : "Describes the status of the associated risk.",
+    "$id" : "#field_oscal-assessment-common_risk-status",
+    "anyOf" : 
+    [ 
+     { "$ref" : "#/definitions/TokenDatatype" },
+     
+     { "enum" : 
+      [ "open",
+       "investigating",
+       "remediating",
+       "deviation-requested",
+       "deviation-approved",
+       "closed" ] } ] },
+   "oscal-complete-oscal-assessment-common:characterization" : 
+   { "title" : "Characterization",
+    "description" : "A collection of descriptive data about the containing object from a specific origin.",
+    "$id" : "#assembly_oscal-assessment-common_characterization",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origin" : 
+     { "$ref" : "#assembly_oscal-assessment-common_origin" },
+     "facets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Facet",
+       "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
+       "type" : "object",
+       "properties" : 
+       { "name" : 
+        { "title" : "Facet Name",
+         "description" : "The name of the risk metric within the specified system.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "system" : 
+        { "title" : "Naming System",
+         "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
+         "anyOf" : 
+         [ 
+          { "$ref" : "#/definitions/URIDatatype" },
+          
+          { "enum" : 
+           [ "http://fedramp.gov",
+            "http://fedramp.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal/unknown",
+            "http://cve.mitre.org",
+            "http://www.first.org/cvss/v2.0",
+            "http://www.first.org/cvss/v3.0",
+            "http://www.first.org/cvss/v3.1" ] } ] },
+        "value" : 
+        { "title" : "Facet Value",
+         "description" : "Indicates the value of the facet.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "name",
+        "system",
+        "value" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "origin",
+     "facets" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:response" : 
+   { "title" : "Risk Response",
+    "description" : "Describes either recommended or an actual plan for addressing the risk.",
+    "$id" : "#assembly_oscal-assessment-common_response",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Remediation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "lifecycle" : 
+     { "title" : "Remediation Intent",
+      "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "recommendation",
+         "planned",
+         "completed" ] } ] },
+     "title" : 
+     { "title" : "Response Title",
+      "description" : "The title for this response activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Response Description",
+      "description" : "A human-readable description of this response plan.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "required-assets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Required Asset",
+       "description" : "Identifies an asset required to achieve remediation.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Required Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+        "title" : 
+        { "title" : "Title for Required Asset",
+         "description" : "The title for this required asset.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Description of Required Asset",
+         "description" : "A human-readable description of this required asset.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "lifecycle",
+     "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-assessment-common:assessment-part" : 
+   { "title" : "Assessment Part",
+    "description" : "A partition of an assessment plan or results or a child of another part.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-part",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Part Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "asset",
+         "method",
+         "objective" ] } ] },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "A name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ar:assessment-results" : 
+   { "title" : "Security Assessment Results (SAR)",
+    "description" : "Security assessment results, such as those provided by a FedRAMP assessor in the FedRAMP Security Assessment Report.",
+    "$id" : "#assembly_oscal-ar_assessment-results",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Results Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-ap" : 
+     { "$ref" : "#assembly_oscal-ar_import-ap" },
+     "local-definitions" : 
+     { "title" : "Local Definitions",
+      "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
+      "type" : "object",
+      "properties" : 
+      { "objectives-and-methods" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_local-objective" } },
+       "activities" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_activity" } },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "additionalProperties" : false },
+     "results" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ar_result" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "import-ap",
+     "results" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ar:result" : 
+   { "title" : "Assessment Result",
+    "description" : "Used by the assessment results and POA&M. In the assessment results, this identifies all of the assessment observations and findings, initial and residual risks, deviations, and disposition. In the POA&M, this identifies initial and residual risks, deviations, and disposition.",
+    "$id" : "#assembly_oscal-ar_result",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Results Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Results Title",
+      "description" : "The title for this set of results.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Results Description",
+      "description" : "A human-readable description of this set of test results.",
+      "type" : "string" },
+     "start" : 
+     { "title" : "start field",
+      "description" : "Date/time stamp identifying the start of the evidence collection reflected in these results.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "end" : 
+     { "title" : "end field",
+      "description" : "Date/time stamp identifying the end of the evidence collection reflected in these results. In a continuous motoring scenario, this may contain the same value as start if appropriate.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "local-definitions" : 
+     { "title" : "Local Definitions",
+      "description" : "Used to define data objects that are used in the assessment plan, that do not appear in the referenced SSP.",
+      "type" : "object",
+      "properties" : 
+      { "components" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+       "inventory-items" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+       "users" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
+       "assessment-assets" : 
+       { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
+       "tasks" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_task" } } },
+      "additionalProperties" : false },
+     "reviewed-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "attestations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Attestation Statements",
+       "description" : "A set of textual statements, typically written by the assessor.",
+       "type" : "object",
+       "properties" : 
+       { "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "parts" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } } },
+       "required" : 
+       [ "parts" ],
+       "additionalProperties" : false } },
+     "assessment-log" : 
+     { "title" : "Assessment Log",
+      "description" : "A log of all assessment-related actions taken.",
+      "type" : "object",
+      "properties" : 
+      { "entries" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Assessment Log Entry",
+         "description" : "Identifies the result of an action and/or task that occurred as part of executing an assessment plan or an assessment event that occurred in producing the assessment results.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Assessment Log Entry Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "title" : 
-          { "title" : "POA&M Item Title",
-            "description" : "The title or name for this POA&M item .",
-            "type" : "string" },
+          { "title" : "Action Title",
+           "description" : "The title for this event.",
+           "type" : "string" },
           "description" : 
-          { "title" : "POA&M Item Description",
-            "description" : "A human-readable description of POA&M item.",
-            "type" : "string" },
+          { "title" : "Action Description",
+           "description" : "A human-readable description of this event.",
+           "type" : "string" },
+          "start" : 
+          { "title" : "Start",
+           "description" : "Identifies the start date and time of an event.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          "end" : 
+          { "title" : "End",
+           "description" : "Identifies the end date and time of an event. If the event is a point in time, the start and end will be the same date and time.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Origin",
-              "description" : "Identifies the source of the finding, such as a tool or person.",
-              "type" : "object",
-              "properties" : 
-              { "actors" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } } },
-              "required" : 
-              [ "actors" ],
-              "additionalProperties" : false } },
-          "related-observations" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "logged-by" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the poam-item to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } },
-          "related-risks" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
+          "related-tasks" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Risk",
-              "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "risk-uuid" : 
-                { "title" : "Risk Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "risk-uuid" ],
-              "additionalProperties" : false } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "description" ],
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "BooleanDatatype" : 
-      { "description" : "A binary value that is either: true or false.",
-        "type" : "boolean" },
-      "DateDatatype" : 
-      { "description" : "A string representing a 24-hour period with an optional timezone.",
-        "type" : "string",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?$" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "IntegerDatatype" : 
-      { "description" : "A whole number value.",
-        "type" : "integer" },
-      "NonNegativeIntegerDatatype" : 
-      { "description" : "An integer value that is equal to or greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 0 } ] },
-      "PositiveIntegerDatatype" : 
-      { "description" : "An integer value that is greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 1 } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
-    "oneOf" : 
+         "required" : 
+         [ "uuid",
+          "start" ],
+         "additionalProperties" : false } } },
+      "required" : 
+      [ "entries" ],
+      "additionalProperties" : false },
+     "observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_observation" } },
+     "risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_risk" } },
+     "findings" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_finding" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "start",
+     "reviewed-controls" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-ar:import-ap" : 
+   { "title" : "Import Assessment Plan",
+    "description" : "Used by assessment-results to import information about the original plan for assessing the system.",
+    "$id" : "#assembly_oscal-ar_import-ap",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Assessment Plan Reference",
+      "description" : "A resolvable URL reference to the assessment plan governing the assessment activities.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-poam:plan-of-action-and-milestones" : 
+   { "title" : "Plan of Action and Milestones (POA&M)",
+    "description" : "A plan of action and milestones which identifies initial and residual risks, deviations, and disposition, such as those required by FedRAMP.",
+    "$id" : "#assembly_oscal-poam_plan-of-action-and-milestones",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "POA&M Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-ssp" : 
+     { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
+     "system-id" : 
+     { "$ref" : "#field_oscal-implementation-common_system-id" },
+     "local-definitions" : 
+     { "$ref" : "#assembly_oscal-poam_local-definitions" },
+     "observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_observation" } },
+     "risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_risk" } },
+     "findings" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_finding" } },
+     "poam-items" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-poam_poam-item" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "poam-items" ],
+    "additionalProperties" : false },
+   "oscal-complete-oscal-poam:local-definitions" : 
+   { "title" : "Local Definitions",
+    "description" : "Allows components, and inventory-items to be defined within the POA&M for circumstances where no OSCAL-based SSP exists, or is not delivered with the POA&M.",
+    "$id" : "#assembly_oscal-poam_local-definitions",
+    "type" : "object",
+    "properties" : 
+    { "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "inventory-items" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+     "assessment-assets" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "additionalProperties" : false },
+   "oscal-complete-oscal-poam:poam-item" : 
+   { "title" : "POA&M Item",
+    "description" : "Describes an individual POA&M item.",
+    "$id" : "#assembly_oscal-poam_poam-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "POA&M Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "POA&M Item Title",
+      "description" : "The title or name for this POA&M item .",
+      "type" : "string" },
+     "description" : 
+     { "title" : "POA&M Item Description",
+      "description" : "A human-readable description of POA&M item.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Origin",
+       "description" : "Identifies the source of the finding, such as a tool or person.",
+       "type" : "object",
+       "properties" : 
+       { "actors" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } } },
+       "required" : 
+       [ "actors" ],
+       "additionalProperties" : false } },
+     "related-findings" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Finding",
+       "description" : "Relates the poam-item to referenced finding(s).",
+       "type" : "object",
+       "properties" : 
+       { "finding-uuid" : 
+        { "title" : "Finding Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a finding defined in the list of findings.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "finding-uuid" ],
+       "additionalProperties" : false } },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the poam-item to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } },
+     "related-risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Risk",
+       "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "risk-uuid" : 
+        { "title" : "Risk Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "risk-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "description" ],
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "BooleanDatatype" : 
+   { "description" : "A binary value that is either: true or false.",
+    "type" : "boolean" },
+   "DateDatatype" : 
+   { "description" : "A string representing a 24-hour period with an optional timezone.",
+    "type" : "string",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?$" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
     [ 
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "catalog" : 
-          { "$ref" : "#assembly_oscal-catalog_catalog" } },
-        "required" : 
-        [ "catalog" ],
-        "additionalProperties" : false },
-      
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "profile" : 
-          { "$ref" : "#assembly_oscal-profile_profile" } },
-        "required" : 
-        [ "profile" ],
-        "additionalProperties" : false },
-      
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "component-definition" : 
-          { "$ref" : "#assembly_oscal-component-definition_component-definition" } },
-        "required" : 
-        [ "component-definition" ],
-        "additionalProperties" : false },
-      
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "system-security-plan" : 
-          { "$ref" : "#assembly_oscal-ssp_system-security-plan" } },
-        "required" : 
-        [ "system-security-plan" ],
-        "additionalProperties" : false },
-      
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "assessment-plan" : 
-          { "$ref" : "#assembly_oscal-ap_assessment-plan" } },
-        "required" : 
-        [ "assessment-plan" ],
-        "additionalProperties" : false },
-      
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "assessment-results" : 
-          { "$ref" : "#assembly_oscal-ar_assessment-results" } },
-        "required" : 
-        [ "assessment-results" ],
-        "additionalProperties" : false },
-      
-      { "properties" : 
-        { "$schema" : 
-          { "$ref" : "#json-schema-directive" },
-          "plan-of-action-and-milestones" : 
-          { "$ref" : "#assembly_oscal-poam_plan-of-action-and-milestones" } },
-        "required" : 
-        [ "plan-of-action-and-milestones" ],
-        "additionalProperties" : false } ] }
\ No newline at end of file
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "IntegerDatatype" : 
+   { "description" : "A whole number value.",
+    "type" : "integer" },
+   "NonNegativeIntegerDatatype" : 
+   { "description" : "An integer value that is equal to or greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 0 } ] },
+   "PositiveIntegerDatatype" : 
+   { "description" : "An integer value that is greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 1 } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "oneOf" : 
+  [ 
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "catalog" : 
+     { "$ref" : "#assembly_oscal-catalog_catalog" } },
+    "required" : 
+    [ "catalog" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "mapping-collection" : 
+     { "$ref" : "#assembly_oscal-mapping_mapping-collection" } },
+    "required" : 
+    [ "mapping-collection" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "profile" : 
+     { "$ref" : "#assembly_oscal-profile_profile" } },
+    "required" : 
+    [ "profile" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "component-definition" : 
+     { "$ref" : "#assembly_oscal-component-definition_component-definition" } },
+    "required" : 
+    [ "component-definition" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "system-security-plan" : 
+     { "$ref" : "#assembly_oscal-ssp_system-security-plan" } },
+    "required" : 
+    [ "system-security-plan" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "assessment-plan" : 
+     { "$ref" : "#assembly_oscal-ap_assessment-plan" } },
+    "required" : 
+    [ "assessment-plan" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "assessment-results" : 
+     { "$ref" : "#assembly_oscal-ar_assessment-results" } },
+    "required" : 
+    [ "assessment-results" ],
+    "additionalProperties" : false },
+   
+   { "properties" : 
+    { "$schema" : 
+     { "$ref" : "#json-schema-directive" },
+     "plan-of-action-and-milestones" : 
+     { "$ref" : "#assembly_oscal-poam_plan-of-action-and-milestones" } },
+    "required" : 
+    [ "plan-of-action-and-milestones" ],
+    "additionalProperties" : false } ] }
\ No newline at end of file
diff --git a/json/schema/oscal_component_schema.json b/json/schema/oscal_component_schema.json
index fef1792e0d..950e1e4c02 100644
--- a/json/schema/oscal_component_schema.json
+++ b/json/schema/oscal_component_schema.json
@@ -1,1599 +1,1638 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-component-definition-schema.json",
-    "$comment" : "OSCAL Component Definition Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-component-definition-schema.json",
+  "$comment" : "OSCAL Component Definition Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-component-definition-oscal-component-definition:component-definition" : 
+   { "title" : "Component Definition",
+    "description" : "A collection of component descriptions, which may optionally be grouped by capability.",
+    "$id" : "#assembly_oscal-component-definition_component-definition",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-component-definition-oscal-component-definition:component-definition" : 
-      { "title" : "Component Definition",
-        "description" : "A collection of component descriptions, which may optionally be grouped by capability.",
-        "$id" : "#assembly_oscal-component-definition_component-definition",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Definition Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component definition elsewhere in this or other OSCAL instances. The locally defined UUID of the component definition can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-component-definitions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_import-component-definition" } },
-          "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_defined-component" } },
-          "capabilities" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_capability" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:import-component-definition" : 
-      { "title" : "Import Component Definition",
-        "description" : "Loads a component definition from another resource.",
-        "$id" : "#assembly_oscal-component-definition_import-component-definition",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hyperlink Reference",
-            "description" : "A link to a resource that defines a set of components and/or capabilities to import into this collection.",
-            "$ref" : "#/definitions/URIReferenceDatatype" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:defined-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-component-definition_defined-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "control-implementations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:capability" : 
-      { "title" : "Capability",
-        "description" : "A grouping of other components and/or capabilities.",
-        "$id" : "#assembly_oscal-component-definition_capability",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Capability Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this capability elsewhere in this or other OSCAL instances. The locally defined UUID of the capability can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Capability Name",
-            "description" : "The capability's human-readable name.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Capability Description",
-            "description" : "A summary of the capability.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "incorporates-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_incorporates-component" } },
-          "control-implementations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "name",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:incorporates-component" : 
-      { "title" : "Incorporates Component",
-        "description" : "TBD",
-        "$id" : "#assembly_oscal-component-definition_incorporates-component",
-        "type" : "object",
-        "properties" : 
-        { "component-uuid" : 
-          { "title" : "Component Reference",
-            "description" : "A machine-oriented identifier reference to a component.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" } },
-        "required" : 
-        [ "component-uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:control-implementation" : 
-      { "title" : "Control Implementation Set",
-        "description" : "Defines how the component or capability supports a set of controls.",
-        "$id" : "#assembly_oscal-component-definition_control-implementation",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Control Implementation Set Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a set of implemented controls elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation set can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "source" : 
-          { "title" : "Source Resource Reference",
-            "description" : "A reference to an OSCAL catalog or profile providing the referenced control or subcontrol definition.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "A description of how the specified set of controls are implemented for the containing component or capability.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implemented-requirements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_implemented-requirement" } } },
-        "required" : 
-        [ "uuid",
-          "source",
-          "description",
-          "implemented-requirements" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:implemented-requirement" : 
-      { "title" : "Control Implementation",
-        "description" : "Describes how the containing component or capability implements an individual control.",
-        "$id" : "#assembly_oscal-component-definition_implemented-requirement",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Control Implementation Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a specific control implementation elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "A suggestion for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "statements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-component-definition_statement" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "control-id",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-component-definition:statement" : 
-      { "title" : "Control Statement Implementation",
-        "description" : "Identifies which statements within a control are addressed.",
-        "$id" : "#assembly_oscal-component-definition_statement",
-        "type" : "object",
-        "properties" : 
-        { "statement-id" : 
-          { "title" : "Control Statement Reference",
-            "description" : "A human-oriented identifier reference to a control statement.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "uuid" : 
-          { "title" : "Control Statement Reference Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Statement Implementation Description",
-            "description" : "A summary of how the containing control statement is implemented by the component or capability.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "statement-id",
-          "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:system-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-implementation-common_system-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "this-system",
-                  "system",
-                  "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation",
-                  "network" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the system component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Status",
-            "description" : "Describes the operational status of the system component.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "State",
-                "description" : "The operational status.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "under-development",
-                      "operational",
-                      "disposition",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:protocol" : 
-      { "title" : "Service Protocol Information",
-        "description" : "Information about the protocol used to provide a service.",
-        "$id" : "#assembly_oscal-implementation-common_protocol",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Service Protocol Information Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Protocol Name",
-            "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "title" : 
-          { "title" : "Protocol Title",
-            "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
-            "type" : "string" },
-          "port-ranges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:port-range" : 
-      { "title" : "Port Range",
-        "description" : "Where applicable this is the IPv4 port range on which the service operates.",
-        "$id" : "#assembly_oscal-implementation-common_port-range",
-        "type" : "object",
-        "properties" : 
-        { "start" : 
-          { "title" : "Start",
-            "description" : "Indicates the starting port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "end" : 
-          { "title" : "End",
-            "description" : "Indicates the ending port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "transport" : 
-          { "title" : "Transport",
-            "description" : "Indicates the transport type.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "TCP",
-                  "UDP" ] } ] } },
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:implementation-status" : 
-      { "title" : "Implementation Status",
-        "description" : "Indicates the degree to which the a given control is implemented.",
-        "$id" : "#assembly_oscal-implementation-common_implementation-status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "Implementation State",
-            "description" : "Identifies the implementation status of the control or control objective.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "implemented",
-                  "partial",
-                  "planned",
-                  "alternative",
-                  "not-applicable" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:system-user" : 
-      { "title" : "System User",
-        "description" : "A type of user that interacts with the system based on an associated role.",
-        "$id" : "#assembly_oscal-implementation-common_system-user",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "User Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "User Title",
-            "description" : "A name given to the user, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "User Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the user.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "User Description",
-            "description" : "A summary of the user's purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:authorized-privilege" : 
-      { "title" : "Privilege",
-        "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
-        "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Privilege Title",
-            "description" : "A human readable name for the privilege.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Privilege Description",
-            "description" : "A summary of the privilege's purpose within the system.",
-            "type" : "string" },
-          "functions-performed" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" : 
-        [ "title",
-          "functions-performed" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:function-performed" : 
-      { "title" : "Functions Performed",
-        "description" : "Describes a function performed for a given authorized privilege by this user class.",
-        "$id" : "#field_oscal-implementation-common_function-performed",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-component-definition-oscal-implementation-common:inventory-item" : 
-      { "title" : "Inventory Item",
-        "description" : "A single managed inventory item within the system.",
-        "$id" : "#assembly_oscal-implementation-common_inventory-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Inventory Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Inventory Item Description",
-            "description" : "A summary of the inventory item stating its purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Implemented Component",
-              "description" : "The set of components that are implemented in a given system inventory item.",
-              "type" : "object",
-              "properties" : 
-              { "component-uuid" : 
-                { "title" : "Component Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "component-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:set-parameter" : 
-      { "title" : "Set Parameter Value",
-        "description" : "Identifies the parameter that will be set by the enclosed value.",
-        "$id" : "#assembly_oscal-implementation-common_set-parameter",
-        "type" : "object",
-        "properties" : 
-        { "param-id" : 
-          { "title" : "Parameter ID",
-            "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Value",
-              "description" : "A parameter value or set of values.",
-              "$ref" : "#/definitions/StringDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "param-id",
-          "values" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-implementation-common:system-id" : 
-      { "title" : "System Identification",
-        "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
-        "$id" : "#field_oscal-implementation-common_system-id",
-        "type" : "object",
-        "properties" : 
-        { "identifier-type" : 
-          { "title" : "Identification System Type",
-            "description" : "Identifies the identification system from which the provided identifier was assigned.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "https://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal",
-                  "https://ietf.org/rfc/rfc4122",
-                  "http://ietf.org/rfc/rfc4122" ] } ] },
-          "id" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:revision" : 
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Definition Universally Unique Identifier",
+      "description" : "Provides a globally unique means to identify a given component definition instance.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-component-definitions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_import-component-definition" } },
+     "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_defined-component" } },
+     "capabilities" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_capability" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:import-component-definition" : 
+   { "title" : "Import Component Definition",
+    "description" : "Loads a component definition from another resource.",
+    "$id" : "#assembly_oscal-component-definition_import-component-definition",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hyperlink Reference",
+      "description" : "A link to a resource that defines a set of components and/or capabilities to import into this collection.",
+      "$ref" : "#/definitions/URIReferenceDatatype" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:defined-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-component-definition_defined-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "Provides a globally unique means to identify a given component.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "control-implementations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:capability" : 
+   { "title" : "Capability",
+    "description" : "A grouping of other components and/or capabilities.",
+    "$id" : "#assembly_oscal-component-definition_capability",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Capability Identifier",
+      "description" : "Provides a globally unique means to identify a given capability.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Capability Name",
+      "description" : "The capability's human-readable name.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "Capability Description",
+      "description" : "A summary of the capability.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "incorporates-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_incorporates-component" } },
+     "control-implementations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_control-implementation" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "name",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:incorporates-component" : 
+   { "title" : "Incorporates Component",
+    "description" : "The collection of components comprising this capability.",
+    "$id" : "#assembly_oscal-component-definition_incorporates-component",
+    "type" : "object",
+    "properties" : 
+    { "component-uuid" : 
+     { "title" : "Component Reference",
+      "description" : "A machine-oriented identifier reference to a component.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" } },
+    "required" : 
+    [ "component-uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:control-implementation" : 
+   { "title" : "Control Implementation Set",
+    "description" : "Defines how the component or capability supports a set of controls.",
+    "$id" : "#assembly_oscal-component-definition_control-implementation",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Control Implementation Set Identifier",
+      "description" : "Provides a means to identify a set of control implementations that are supported by a given component or capability.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "source" : 
+     { "title" : "Source Resource Reference",
+      "description" : "A reference to an OSCAL catalog or profile providing the referenced control or subcontrol definition.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "A description of how the specified set of controls are implemented for the containing component or capability.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "implemented-requirements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_implemented-requirement" } } },
+    "required" : 
+    [ "uuid",
+     "source",
+     "description",
+     "implemented-requirements" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:implemented-requirement" : 
+   { "title" : "Control Implementation",
+    "description" : "Describes how the containing component or capability implements an individual control.",
+    "$id" : "#assembly_oscal-component-definition_implemented-requirement",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Control Implementation Identifier",
+      "description" : "Provides a globally unique means to identify a given control implementation by a component.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "A suggestion from the supplier (e.g., component vendor or author) for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "statements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-component-definition_statement" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "control-id",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-component-definition:statement" : 
+   { "title" : "Control Statement Implementation",
+    "description" : "Identifies which statements within a control are addressed.",
+    "$id" : "#assembly_oscal-component-definition_statement",
+    "type" : "object",
+    "properties" : 
+    { "statement-id" : 
+     { "title" : "Control Statement Reference",
+      "description" : "A human-oriented identifier reference to a control statement.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Control Statement Reference Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Statement Implementation Description",
+      "description" : "A summary of how the containing control statement is implemented by the component or capability.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "statement-id",
+     "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:system-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-implementation-common_system-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "this-system",
+         "system",
+         "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation",
+         "network" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the system component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Status",
+      "description" : "Describes the operational status of the system component.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "State",
+        "description" : "The operational status.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "under-development",
+           "operational",
+           "disposition",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:protocol" : 
+   { "title" : "Service Protocol Information",
+    "description" : "Information about the protocol used to provide a service.",
+    "$id" : "#assembly_oscal-implementation-common_protocol",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Service Protocol Information Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Protocol Name",
+      "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "title" : 
+     { "title" : "Protocol Title",
+      "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
+      "type" : "string" },
+     "port-ranges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:port-range" : 
+   { "title" : "Port Range",
+    "description" : "Where applicable this is the IPv4 port range on which the service operates.",
+    "$id" : "#assembly_oscal-implementation-common_port-range",
+    "type" : "object",
+    "properties" : 
+    { "start" : 
+     { "title" : "Start",
+      "description" : "Indicates the starting port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "end" : 
+     { "title" : "End",
+      "description" : "Indicates the ending port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "transport" : 
+     { "title" : "Transport",
+      "description" : "Indicates the transport type.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "TCP",
+         "UDP" ] } ] } },
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:implementation-status" : 
+   { "title" : "Implementation Status",
+    "description" : "Indicates the degree to which the a given control is implemented.",
+    "$id" : "#assembly_oscal-implementation-common_implementation-status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "Implementation State",
+      "description" : "Identifies the implementation status of the control or control objective.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "implemented",
+         "partial",
+         "planned",
+         "alternative",
+         "not-applicable" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:system-user" : 
+   { "title" : "System User",
+    "description" : "A type of user that interacts with the system based on an associated role.",
+    "$id" : "#assembly_oscal-implementation-common_system-user",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "User Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "User Title",
+      "description" : "A name given to the user, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "short-name" : 
+     { "title" : "User Short Name",
+      "description" : "A short common name, abbreviation, or acronym for the user.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "User Description",
+      "description" : "A summary of the user's purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "role-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_role-id" } },
+     "authorized-privileges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:authorized-privilege" : 
+   { "title" : "Privilege",
+    "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
+    "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Privilege Title",
+      "description" : "A human readable name for the privilege.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Privilege Description",
+      "description" : "A summary of the privilege's purpose within the system.",
+      "type" : "string" },
+     "functions-performed" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
+    "required" : 
+    [ "title",
+     "functions-performed" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:function-performed" : 
+   { "title" : "Functions Performed",
+    "description" : "Describes a function performed for a given authorized privilege by this user class.",
+    "$id" : "#field_oscal-implementation-common_function-performed",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-component-definition-oscal-implementation-common:inventory-item" : 
+   { "title" : "Inventory Item",
+    "description" : "A single managed inventory item within the system.",
+    "$id" : "#assembly_oscal-implementation-common_inventory-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Inventory Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Inventory Item Description",
+      "description" : "A summary of the inventory item stating its purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "implemented-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Implemented Component",
+       "description" : "The set of components that are implemented in a given system inventory item.",
+       "type" : "object",
+       "properties" : 
+       { "component-uuid" : 
+        { "title" : "Component Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "component-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:set-parameter" : 
+   { "title" : "Set Parameter Value",
+    "description" : "Identifies the parameter that will be set by the enclosed value.",
+    "$id" : "#assembly_oscal-implementation-common_set-parameter",
+    "type" : "object",
+    "properties" : 
+    { "param-id" : 
+     { "title" : "Parameter ID",
+      "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Value",
+       "description" : "A parameter value or set of values.",
+       "$ref" : "#/definitions/StringDatatype" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "param-id",
+     "values" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-implementation-common:system-id" : 
+   { "title" : "System Identification",
+    "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
+    "$id" : "#field_oscal-implementation-common_system-id",
+    "type" : "object",
+    "properties" : 
+    { "identifier-type" : 
+     { "title" : "Identification System Type",
+      "description" : "Identifies the identification system from which the provided identifier was assigned.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "https://fedramp.gov",
+         "http://fedramp.gov/ns/oscal",
+         "https://ietf.org/rfc/rfc4122",
+         "http://ietf.org/rfc/rfc4122" ] } ] },
+     "id" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:location" : 
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-component-definition-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
             [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-component-definition-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-component-definition-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-component-definition-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-component-definition-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-component-definition-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
             "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
           "media-type" : 
           { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
           "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-component-definition-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-component-definition-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-component-definition-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-component-definition-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-component-definition-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-component-definition-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-component-definition-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-component-definition-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-component-definition-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "IntegerDatatype" : 
-      { "description" : "A whole number value.",
-        "type" : "integer" },
-      "NonNegativeIntegerDatatype" : 
-      { "description" : "An integer value that is equal to or greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 0 } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-component-definition-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-component-definition-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-component-definition-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-component-definition-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-component-definition-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-component-definition-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-component-definition-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "component-definition" : 
-      { "$ref" : "#assembly_oscal-component-definition_component-definition" } },
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
     "required" : 
-    [ "component-definition" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-component-definition-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-component-definition-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "IntegerDatatype" : 
+   { "description" : "A whole number value.",
+    "type" : "integer" },
+   "NonNegativeIntegerDatatype" : 
+   { "description" : "An integer value that is equal to or greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 0 } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "component-definition" : 
+   { "$ref" : "#assembly_oscal-component-definition_component-definition" } },
+  "required" : 
+  [ "component-definition" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_mapping_schema.json b/json/schema/oscal_mapping_schema.json
new file mode 100644
index 0000000000..d5bbde6346
--- /dev/null
+++ b/json/schema/oscal_mapping_schema.json
@@ -0,0 +1,946 @@
+
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.3/oscal-mapping-schema.json",
+  "$comment" : "OSCAL Control Mapping Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-mapping-oscal-mapping:mapping-collection" : 
+   { "title" : "Mapping Collection",
+    "description" : "A collection of relationship-based control and/or control statement mappings.",
+    "$id" : "#assembly_oscal-mapping_mapping-collection",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Collection Universally Unique Identifier",
+      "description" : "A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "mappings" : 
+     { "anyOf" : 
+      [ 
+       { "$ref" : "#assembly_oscal-mapping_mapping" },
+       
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-mapping_mapping" } } ] },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "mappings" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-mapping:mapping" : 
+   { "title" : "Control Mapping",
+    "description" : "A mapping between two target resources.",
+    "$id" : "#assembly_oscal-mapping_mapping",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined UUID of the mapping can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same mapping across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "source-resource" : 
+     { "$ref" : "#assembly_oscal-mapping-common_mapping-resource-reference" },
+     "target-resource" : 
+     { "$ref" : "#assembly_oscal-mapping-common_mapping-resource-reference" },
+     "maps" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_map" } } },
+    "required" : 
+    [ "uuid",
+     "source-resource",
+     "target-resource",
+     "maps" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Revision History Entry",
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Location",
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
+            [ 
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-mapping-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-mapping-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-mapping-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
+          "props" : 
+          { "type" : "array",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
+          "links" : 
+          { "type" : "array",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
+            "$ref" : "#/definitions/URIReferenceDatatype" },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
+          "media-type" : 
+          { "title" : "Media Type",
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
+          "value" : 
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-mapping-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-mapping-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-mapping-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-mapping-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-mapping-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-mapping-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-mapping-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-mapping-common:map" : 
+   { "title" : "Mapping Entry",
+    "description" : "A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.",
+    "$id" : "#assembly_oscal-mapping-common_map",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Mapping Entry Identifier",
+      "description" : "The unique identifier for the mapping entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "relationship" : 
+     { "title" : "Mapping Entry Relationship",
+      "description" : "The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.",
+      "type" : "object",
+      "properties" : 
+      { "ns" : 
+       { "title" : "Relationship Value Namespace",
+        "description" : "A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.",
+        "$ref" : "#/definitions/URIDatatype" },
+       "type" : 
+       { "$ref" : "#/definitions/TokenDatatype" } },
+      "required" : 
+      [ "type" ],
+      "additionalProperties" : false },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_mapping-item" } },
+     "targets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-mapping-common_mapping-item" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "relationship",
+     "sources",
+     "targets" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-mapping-common:mapping-item" : 
+   { "title" : "Mapping Entry Item (source or target)",
+    "description" : "Identifies a specific edge within a source or target that is the subject of a mapping.",
+    "$id" : "#assembly_oscal-mapping-common_mapping-item",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "The semantic type of the subject.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "control",
+         "statement" ] } ] },
+     "id-ref" : 
+     { "title" : "Subject Identifier Reference",
+      "description" : "A reference to an identified subject that is of the specified type.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "id-ref" ],
+    "additionalProperties" : false },
+   "oscal-mapping-oscal-mapping-common:mapping-resource-reference" : 
+   { "title" : "Mapped Resource Reference",
+    "description" : "A reference to a resource that is either the source or target of a mapping.",
+    "$id" : "#assembly_oscal-mapping-common_mapping-resource-reference",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Resource Type",
+      "description" : "The semantic type of the resource.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "catalog" ] } ] },
+     "href" : 
+     { "title" : "Catalog or Profile Reference",
+      "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "href" ],
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "mapping-collection" : 
+   { "$ref" : "#assembly_oscal-mapping_mapping-collection" } },
+  "required" : 
+  [ "mapping-collection" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_poam_schema.json b/json/schema/oscal_poam_schema.json
index e37ced7806..682e5851dd 100644
--- a/json/schema/oscal_poam_schema.json
+++ b/json/schema/oscal_poam_schema.json
@@ -1,2957 +1,3095 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-poam-schema.json",
-    "$comment" : "OSCAL Plan of Action and Milestones (POA&M) Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-poam-schema.json",
+  "$comment" : "OSCAL Plan of Action and Milestones (POA&M) Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-poam-oscal-poam:plan-of-action-and-milestones" : 
+   { "title" : "Plan of Action and Milestones (POA&M)",
+    "description" : "A plan of action and milestones which identifies initial and residual risks, deviations, and disposition, such as those required by FedRAMP.",
+    "$id" : "#assembly_oscal-poam_plan-of-action-and-milestones",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-poam-oscal-poam:plan-of-action-and-milestones" : 
-      { "title" : "Plan of Action and Milestones (POA&M)",
-        "description" : "A plan of action and milestones which identifies initial and residual risks, deviations, and disposition, such as those required by FedRAMP.",
-        "$id" : "#assembly_oscal-poam_plan-of-action-and-milestones",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "POA&M Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-ssp" : 
-          { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
-          "system-id" : 
-          { "$ref" : "#field_oscal-implementation-common_system-id" },
-          "local-definitions" : 
-          { "$ref" : "#assembly_oscal-poam_local-definitions" },
-          "observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_observation" } },
-          "risks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_risk" } },
-          "poam-items" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-poam_poam-item" } },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "poam-items" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-poam:local-definitions" : 
-      { "title" : "Local Definitions",
-        "description" : "Allows components, and inventory-items to be defined within the POA&M for circumstances where no OSCAL-based SSP exists, or is not delivered with the POA&M.",
-        "$id" : "#assembly_oscal-poam_local-definitions",
-        "type" : "object",
-        "properties" : 
-        { "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "additionalProperties" : false },
-      "oscal-poam-oscal-poam:poam-item" : 
-      { "title" : "POA&M Item",
-        "description" : "Describes an individual POA&M item.",
-        "$id" : "#assembly_oscal-poam_poam-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "POA&M Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "POA&M Item Title",
-            "description" : "The title or name for this POA&M item .",
-            "type" : "string" },
-          "description" : 
-          { "title" : "POA&M Item Description",
-            "description" : "A human-readable description of POA&M item.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Origin",
-              "description" : "Identifies the source of the finding, such as a tool or person.",
-              "type" : "object",
-              "properties" : 
-              { "actors" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } } },
-              "required" : 
-              [ "actors" ],
-              "additionalProperties" : false } },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the poam-item to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } },
-          "related-risks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Risk",
-              "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "risk-uuid" : 
-                { "title" : "Risk Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "risk-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:revision" : 
+    "properties" : 
+    { "uuid" : 
+     { "title" : "POA&M Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-ssp" : 
+     { "$ref" : "#assembly_oscal-assessment-common_import-ssp" },
+     "system-id" : 
+     { "$ref" : "#field_oscal-implementation-common_system-id" },
+     "local-definitions" : 
+     { "$ref" : "#assembly_oscal-poam_local-definitions" },
+     "observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_observation" } },
+     "risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_risk" } },
+     "findings" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_finding" } },
+     "poam-items" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-poam_poam-item" } },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "poam-items" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-poam:local-definitions" : 
+   { "title" : "Local Definitions",
+    "description" : "Allows components, and inventory-items to be defined within the POA&M for circumstances where no OSCAL-based SSP exists, or is not delivered with the POA&M.",
+    "$id" : "#assembly_oscal-poam_local-definitions",
+    "type" : "object",
+    "properties" : 
+    { "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "inventory-items" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+     "assessment-assets" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-assets" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "additionalProperties" : false },
+   "oscal-poam-oscal-poam:poam-item" : 
+   { "title" : "POA&M Item",
+    "description" : "Describes an individual POA&M item.",
+    "$id" : "#assembly_oscal-poam_poam-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "POA&M Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "POA&M Item Title",
+      "description" : "The title or name for this POA&M item .",
+      "type" : "string" },
+     "description" : 
+     { "title" : "POA&M Item Description",
+      "description" : "A human-readable description of POA&M item.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Origin",
+       "description" : "Identifies the source of the finding, such as a tool or person.",
+       "type" : "object",
+       "properties" : 
+       { "actors" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } } },
+       "required" : 
+       [ "actors" ],
+       "additionalProperties" : false } },
+     "related-findings" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Finding",
+       "description" : "Relates the poam-item to referenced finding(s).",
+       "type" : "object",
+       "properties" : 
+       { "finding-uuid" : 
+        { "title" : "Finding Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a finding defined in the list of findings.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "finding-uuid" ],
+       "additionalProperties" : false } },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the poam-item to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } },
+     "related-risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Risk",
+       "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "risk-uuid" : 
+        { "title" : "Risk Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "risk-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:location" : 
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-poam-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
             [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-poam-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-poam-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-poam-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-poam-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-poam-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
             "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
           "media-type" : 
           { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
           "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-poam-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-poam-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-poam-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-poam-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-poam-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-poam-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-poam-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-poam-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:system-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-implementation-common_system-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "this-system",
-                  "system",
-                  "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation",
-                  "network" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the system component.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Status",
-            "description" : "Describes the operational status of the system component.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "State",
-                "description" : "The operational status.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "under-development",
-                      "operational",
-                      "disposition",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:protocol" : 
-      { "title" : "Service Protocol Information",
-        "description" : "Information about the protocol used to provide a service.",
-        "$id" : "#assembly_oscal-implementation-common_protocol",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Service Protocol Information Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Protocol Name",
-            "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "title" : 
-          { "title" : "Protocol Title",
-            "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
-            "type" : "string" },
-          "port-ranges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:port-range" : 
-      { "title" : "Port Range",
-        "description" : "Where applicable this is the IPv4 port range on which the service operates.",
-        "$id" : "#assembly_oscal-implementation-common_port-range",
-        "type" : "object",
-        "properties" : 
-        { "start" : 
-          { "title" : "Start",
-            "description" : "Indicates the starting port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "end" : 
-          { "title" : "End",
-            "description" : "Indicates the ending port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "transport" : 
-          { "title" : "Transport",
-            "description" : "Indicates the transport type.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "TCP",
-                  "UDP" ] } ] } },
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:implementation-status" : 
-      { "title" : "Implementation Status",
-        "description" : "Indicates the degree to which the a given control is implemented.",
-        "$id" : "#assembly_oscal-implementation-common_implementation-status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "Implementation State",
-            "description" : "Identifies the implementation status of the control or control objective.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "implemented",
-                  "partial",
-                  "planned",
-                  "alternative",
-                  "not-applicable" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:system-user" : 
-      { "title" : "System User",
-        "description" : "A type of user that interacts with the system based on an associated role.",
-        "$id" : "#assembly_oscal-implementation-common_system-user",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "User Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "User Title",
-            "description" : "A name given to the user, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "User Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the user.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "User Description",
-            "description" : "A summary of the user's purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:authorized-privilege" : 
-      { "title" : "Privilege",
-        "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
-        "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Privilege Title",
-            "description" : "A human readable name for the privilege.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Privilege Description",
-            "description" : "A summary of the privilege's purpose within the system.",
-            "type" : "string" },
-          "functions-performed" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" : 
-        [ "title",
-          "functions-performed" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:function-performed" : 
-      { "title" : "Functions Performed",
-        "description" : "Describes a function performed for a given authorized privilege by this user class.",
-        "$id" : "#field_oscal-implementation-common_function-performed",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-poam-oscal-implementation-common:inventory-item" : 
-      { "title" : "Inventory Item",
-        "description" : "A single managed inventory item within the system.",
-        "$id" : "#assembly_oscal-implementation-common_inventory-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Inventory Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Inventory Item Description",
-            "description" : "A summary of the inventory item stating its purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Implemented Component",
-              "description" : "The set of components that are implemented in a given system inventory item.",
-              "type" : "object",
-              "properties" : 
-              { "component-uuid" : 
-                { "title" : "Component Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "component-uuid" ],
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:set-parameter" : 
-      { "title" : "Set Parameter Value",
-        "description" : "Identifies the parameter that will be set by the enclosed value.",
-        "$id" : "#assembly_oscal-implementation-common_set-parameter",
-        "type" : "object",
-        "properties" : 
-        { "param-id" : 
-          { "title" : "Parameter ID",
-            "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Value",
-              "description" : "A parameter value or set of values.",
-              "$ref" : "#/definitions/StringDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "param-id",
-          "values" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-implementation-common:system-id" : 
-      { "title" : "System Identification",
-        "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
-        "$id" : "#field_oscal-implementation-common_system-id",
-        "type" : "object",
-        "properties" : 
-        { "identifier-type" : 
-          { "title" : "Identification System Type",
-            "description" : "Identifies the identification system from which the provided identifier was assigned.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "https://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal",
-                  "https://ietf.org/rfc/rfc4122",
-                  "http://ietf.org/rfc/rfc4122" ] } ] },
-          "id" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-poam-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-poam-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:import-ssp" : 
-      { "title" : "Import System Security Plan",
-        "description" : "Used by the assessment plan and POA&M to import information about the system.",
-        "$id" : "#assembly_oscal-assessment-common_import-ssp",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "System Security Plan Reference",
-            "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:local-objective" : 
-      { "title" : "Assessment-Specific Control Objective",
-        "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_local-objective",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "description" : 
-          { "title" : "Objective Description",
-            "description" : "A human-readable description of this control objective.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-id",
-          "parts" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-method" : 
-      { "title" : "Assessment Method",
-        "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-method",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Method Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Method Description",
-            "description" : "A human-readable description of this assessment method.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "part" : 
-          { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "part" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:activity" : 
-      { "title" : "Activity",
-        "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
-        "$id" : "#assembly_oscal-assessment-common_activity",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Activity Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Included Activity Title",
-            "description" : "The title for this included activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Included Activity Description",
-            "description" : "A human-readable description of this included activity.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "steps" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Step",
-              "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Step Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Step Title",
-                  "description" : "The title for this step.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Step Description",
-                  "description" : "A human-readable description of this step.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "reviewed-controls" : 
-                { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "related-controls" : 
-          { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:task" : 
-      { "title" : "Task",
-        "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
-        "$id" : "#assembly_oscal-assessment-common_task",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Task Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Task Type",
-            "description" : "The type of task.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "milestone",
-                  "action" ] } ] },
-          "title" : 
-          { "title" : "Task Title",
-            "description" : "The title for this task.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Task Description",
-            "description" : "A human-readable description of this task.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "timing" : 
-          { "title" : "Event Timing",
-            "description" : "The timing under which the task is intended to occur.",
-            "type" : "object",
-            "properties" : 
-            { "on-date" : 
-              { "title" : "On Date Condition",
-                "description" : "The task is intended to occur on the specified date.",
-                "type" : "object",
-                "properties" : 
-                { "date" : 
-                  { "title" : "On Date Condition",
-                    "description" : "The task must occur on the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "date" ],
-                "additionalProperties" : false },
-              "within-date-range" : 
-              { "title" : "On Date Range Condition",
-                "description" : "The task is intended to occur within the specified date range.",
-                "type" : "object",
-                "properties" : 
-                { "start" : 
-                  { "title" : "Start Date Condition",
-                    "description" : "The task must occur on or after the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                  "end" : 
-                  { "title" : "End Date Condition",
-                    "description" : "The task must occur on or before the specified date.",
-                    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
-                "required" : 
-                [ "start",
-                  "end" ],
-                "additionalProperties" : false },
-              "at-frequency" : 
-              { "title" : "Frequency Condition",
-                "description" : "The task is intended to occur at the specified frequency.",
-                "type" : "object",
-                "properties" : 
-                { "period" : 
-                  { "title" : "Period",
-                    "description" : "The task must occur after the specified period has elapsed.",
-                    "$ref" : "#/definitions/PositiveIntegerDatatype" },
-                  "unit" : 
-                  { "title" : "Time Unit",
-                    "description" : "The unit of time for the period.",
-                    "allOf" : 
-                    [ 
-                      { "$ref" : "#/definitions/StringDatatype" },
-                      
-                      { "enum" : 
-                        [ "seconds",
-                          "minutes",
-                          "hours",
-                          "days",
-                          "months",
-                          "years" ] } ] } },
-                "required" : 
-                [ "period",
-                  "unit" ],
-                "additionalProperties" : false } },
-            "additionalProperties" : false },
-          "dependencies" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Task Dependency",
-              "description" : "Used to indicate that a task is dependent on another task.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a unique task.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
-          "associated-activities" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Associated Activity",
-              "description" : "Identifies an individual activity to be performed as part of a task.",
-              "type" : "object",
-              "properties" : 
-              { "activity-uuid" : 
-                { "title" : "Activity Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "activity-uuid",
-                "subjects" ],
-              "additionalProperties" : false } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:reviewed-controls" : 
-      { "title" : "Reviewed Controls and Control Objectives",
-        "description" : "Identifies the controls being assessed and their control objectives.",
-        "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Control Objective Description",
-            "description" : "A human-readable description of control objectives.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "control-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessed Controls",
-              "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Assessed Controls Description",
-                  "description" : "A human-readable description of in-scope controls specified for assessment.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "exclude-controls" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "control-objective-selections" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Referenced Control Objectives",
-              "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
-              "type" : "object",
-              "properties" : 
-              { "description" : 
-                { "title" : "Control Objectives Description",
-                  "description" : "A human-readable description of this collection of control objectives.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "include-all" : 
-                { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-                "include-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "exclude-objectives" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "additionalProperties" : false } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "control-selections" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:select-control-by-id" : 
-      { "title" : "Select Control",
-        "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
-        "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "statement-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Include Specific Statements",
-              "description" : "Used to constrain the selection to only specificity identified statements.",
-              "$ref" : "#/definitions/TokenDatatype" } } },
-        "required" : 
-        [ "control-id" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:select-objective-by-id" : 
-      { "title" : "Select Objective",
-        "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
-        "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
-        "type" : "object",
-        "properties" : 
-        { "objective-id" : 
-          { "title" : "Objective ID",
-            "description" : "Points to an assessment objective.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "objective-id" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-subject-placeholder" : 
-      { "title" : "Assessment Subject Placeholder",
-        "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Assessment Subject Placeholder Description",
-            "description" : "A human-readable description of intent of this assessment subject placeholder.",
-            "type" : "string" },
-          "sources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Subject Source",
-              "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
-              "type" : "object",
-              "properties" : 
-              { "task-uuid" : 
-                { "title" : "Task Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "task-uuid" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "sources" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-subject" : 
-      { "title" : "Subject of Assessment",
-        "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-subject",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Subject Type",
-            "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user" ] } ] },
-          "description" : 
-          { "title" : "Include Subjects Description",
-            "description" : "A human-readable description of the collection of subjects being included in this assessment.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "exclude-subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:select-subject-by-id" : 
-      { "title" : "Select Assessment Subject",
-        "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
-        "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:subject-reference" : 
-      { "title" : "Identifies the Subject",
-        "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
-        "$id" : "#assembly_oscal-assessment-common_subject-reference",
-        "type" : "object",
-        "properties" : 
-        { "subject-uuid" : 
-          { "title" : "Subject Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Subject Universally Unique Identifier Reference Type",
-            "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "component",
-                  "inventory-item",
-                  "location",
-                  "party",
-                  "user",
-                  "resource" ] } ] },
-          "title" : 
-          { "title" : "Subject Reference Title",
-            "description" : "The title or name for the referenced subject.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "subject-uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-assets" : 
-      { "title" : "Assessment Assets",
-        "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-assets",
-        "type" : "object",
-        "properties" : 
-        { "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "assessment-platforms" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Assessment Platform",
-              "description" : "Used to represent the toolset used to perform aspects of the assessment.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Assessment Platform Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Assessment Platform Title",
-                  "description" : "The title or name for the assessment platform.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "uses-components" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Uses Component",
-                    "description" : "The set of components that are used by the assessment platform.",
-                    "type" : "object",
-                    "properties" : 
-                    { "component-uuid" : 
-                      { "title" : "Component Universally Unique Identifier Reference",
-                        "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                        "$ref" : "#/definitions/UUIDDatatype" },
-                      "props" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_property" } },
-                      "links" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_link" } },
-                      "responsible-parties" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                      "remarks" : 
-                      { "$ref" : "#field_oscal-metadata_remarks" } },
-                    "required" : 
-                    [ "component-uuid" ],
-                    "additionalProperties" : false } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "assessment-platforms" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:finding-target" : 
-      { "title" : "Objective Status",
-        "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
-        "$id" : "#assembly_oscal-assessment-common_finding-target",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Finding Target Type",
-            "description" : "Identifies the type of the target.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "statement-id",
-                  "objective-id" ] } ] },
-          "target-id" : 
-          { "title" : "Finding Target Identifier Reference",
-            "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Objective Status Title",
-            "description" : "The title for this objective status.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Objective Status Description",
-            "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Objective Status",
-            "description" : "A determination of if the objective is satisfied or not within a given system.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "Objective Status State",
-                "description" : "An indication as to whether the objective is satisfied or not.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "satisfied",
-                      "not-satisfied" ] } ] },
-              "reason" : 
-              { "title" : "Objective Status Reason",
-                "description" : "The reason the objective was given it's status.",
-                "anyOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "pass",
-                      "fail",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
-          "implementation-status" : 
-          { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "type",
-          "target-id",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:observation" : 
-      { "title" : "Observation",
-        "description" : "Describes an individual observation.",
-        "$id" : "#assembly_oscal-assessment-common_observation",
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-poam-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-poam-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-poam-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-poam-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-poam-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-poam-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-poam-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-poam-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:system-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-implementation-common_system-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "this-system",
+         "system",
+         "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation",
+         "network" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the system component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Status",
+      "description" : "Describes the operational status of the system component.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "State",
+        "description" : "The operational status.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "under-development",
+           "operational",
+           "disposition",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:protocol" : 
+   { "title" : "Service Protocol Information",
+    "description" : "Information about the protocol used to provide a service.",
+    "$id" : "#assembly_oscal-implementation-common_protocol",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Service Protocol Information Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Protocol Name",
+      "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "title" : 
+     { "title" : "Protocol Title",
+      "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
+      "type" : "string" },
+     "port-ranges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:port-range" : 
+   { "title" : "Port Range",
+    "description" : "Where applicable this is the IPv4 port range on which the service operates.",
+    "$id" : "#assembly_oscal-implementation-common_port-range",
+    "type" : "object",
+    "properties" : 
+    { "start" : 
+     { "title" : "Start",
+      "description" : "Indicates the starting port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "end" : 
+     { "title" : "End",
+      "description" : "Indicates the ending port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "transport" : 
+     { "title" : "Transport",
+      "description" : "Indicates the transport type.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "TCP",
+         "UDP" ] } ] } },
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:implementation-status" : 
+   { "title" : "Implementation Status",
+    "description" : "Indicates the degree to which the a given control is implemented.",
+    "$id" : "#assembly_oscal-implementation-common_implementation-status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "Implementation State",
+      "description" : "Identifies the implementation status of the control or control objective.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "implemented",
+         "partial",
+         "planned",
+         "alternative",
+         "not-applicable" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:system-user" : 
+   { "title" : "System User",
+    "description" : "A type of user that interacts with the system based on an associated role.",
+    "$id" : "#assembly_oscal-implementation-common_system-user",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "User Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "User Title",
+      "description" : "A name given to the user, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "short-name" : 
+     { "title" : "User Short Name",
+      "description" : "A short common name, abbreviation, or acronym for the user.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "User Description",
+      "description" : "A summary of the user's purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "role-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_role-id" } },
+     "authorized-privileges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:authorized-privilege" : 
+   { "title" : "Privilege",
+    "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
+    "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Privilege Title",
+      "description" : "A human readable name for the privilege.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Privilege Description",
+      "description" : "A summary of the privilege's purpose within the system.",
+      "type" : "string" },
+     "functions-performed" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
+    "required" : 
+    [ "title",
+     "functions-performed" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:function-performed" : 
+   { "title" : "Functions Performed",
+    "description" : "Describes a function performed for a given authorized privilege by this user class.",
+    "$id" : "#field_oscal-implementation-common_function-performed",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-poam-oscal-implementation-common:inventory-item" : 
+   { "title" : "Inventory Item",
+    "description" : "A single managed inventory item within the system.",
+    "$id" : "#assembly_oscal-implementation-common_inventory-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Inventory Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Inventory Item Description",
+      "description" : "A summary of the inventory item stating its purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "implemented-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Implemented Component",
+       "description" : "The set of components that are implemented in a given system inventory item.",
+       "type" : "object",
+       "properties" : 
+       { "component-uuid" : 
+        { "title" : "Component Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "component-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:set-parameter" : 
+   { "title" : "Set Parameter Value",
+    "description" : "Identifies the parameter that will be set by the enclosed value.",
+    "$id" : "#assembly_oscal-implementation-common_set-parameter",
+    "type" : "object",
+    "properties" : 
+    { "param-id" : 
+     { "title" : "Parameter ID",
+      "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Value",
+       "description" : "A parameter value or set of values.",
+       "$ref" : "#/definitions/StringDatatype" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "param-id",
+     "values" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-implementation-common:system-id" : 
+   { "title" : "System Identification",
+    "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
+    "$id" : "#field_oscal-implementation-common_system-id",
+    "type" : "object",
+    "properties" : 
+    { "identifier-type" : 
+     { "title" : "Identification System Type",
+      "description" : "Identifies the identification system from which the provided identifier was assigned.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "https://fedramp.gov",
+         "http://fedramp.gov/ns/oscal",
+         "https://ietf.org/rfc/rfc4122",
+         "http://ietf.org/rfc/rfc4122" ] } ] },
+     "id" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-poam-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-poam-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-poam-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:import-ssp" : 
+   { "title" : "Import System Security Plan",
+    "description" : "Used by the assessment plan and POA&M to import information about the system.",
+    "$id" : "#assembly_oscal-assessment-common_import-ssp",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "System Security Plan Reference",
+      "description" : "A resolvable URL reference to the system security plan for the system being assessed.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:local-objective" : 
+   { "title" : "Assessment-Specific Control Objective",
+    "description" : "A local definition of a control objective for this assessment. Uses catalog syntax for control objective and assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_local-objective",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "description" : 
+     { "title" : "Objective Description",
+      "description" : "A human-readable description of this control objective.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-id",
+     "parts" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:assessment-method" : 
+   { "title" : "Assessment Method",
+    "description" : "A local definition of a control objective. Uses catalog syntax for control objective and assessment activities.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-method",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Method Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Method Description",
+      "description" : "A human-readable description of this assessment method.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "part" : 
+     { "$ref" : "#assembly_oscal-assessment-common_assessment-part" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "part" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:activity" : 
+   { "title" : "Activity",
+    "description" : "Identifies an assessment or related process that can be performed. In the assessment plan, this is an intended activity which may be associated with an assessment task. In the assessment results, this an activity that was actually performed as part of an assessment.",
+    "$id" : "#assembly_oscal-assessment-common_activity",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Activity Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Included Activity Title",
+      "description" : "The title for this included activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Included Activity Description",
+      "description" : "A human-readable description of this included activity.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "steps" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Step",
+       "description" : "Identifies an individual step in a series of steps related to an activity, such as an assessment test or examination procedure.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Step Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Step Title",
+         "description" : "The title for this step.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Step Description",
+         "description" : "A human-readable description of this step.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "reviewed-controls" : 
+        { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "related-controls" : 
+     { "$ref" : "#assembly_oscal-assessment-common_reviewed-controls" },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:task" : 
+   { "title" : "Task",
+    "description" : "Represents a scheduled event or milestone, which may be associated with a series of assessment actions.",
+    "$id" : "#assembly_oscal-assessment-common_task",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Task Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Task Type",
+      "description" : "The type of task.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "milestone",
+         "action" ] } ] },
+     "title" : 
+     { "title" : "Task Title",
+      "description" : "The title for this task.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Task Description",
+      "description" : "A human-readable description of this task.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "timing" : 
+     { "title" : "Event Timing",
+      "description" : "The timing under which the task is intended to occur.",
+      "type" : "object",
+      "properties" : 
+      { "on-date" : 
+       { "title" : "On Date Condition",
+        "description" : "The task is intended to occur on the specified date.",
         "type" : "object",
         "properties" : 
-        { "uuid" : 
-          { "title" : "Observation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Observation Title",
-            "description" : "The title for this observation.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Observation Description",
-            "description" : "A human-readable description of this assessment observation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "methods" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Method",
-              "description" : "Identifies how the observation was made.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/StringDatatype" },
-                
-                { "enum" : 
-                  [ "EXAMINE",
-                    "INTERVIEW",
-                    "TEST",
-                    "UNKNOWN" ] } ] } },
-          "types" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Observation Type",
-              "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
-              "anyOf" : 
-              [ 
-                { "$ref" : "#/definitions/TokenDatatype" },
-                
-                { "enum" : 
-                  [ "ssp-statement-issue",
-                    "control-objective",
-                    "mitigation",
-                    "finding",
-                    "historic" ] } ] } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-          "relevant-evidence" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Relevant Evidence",
-              "description" : "Links this observation to relevant evidence.",
-              "type" : "object",
-              "properties" : 
-              { "href" : 
-                { "title" : "Relevant Evidence Reference",
-                  "description" : "A resolvable URL reference to relevant evidence.",
-                  "$ref" : "#/definitions/URIReferenceDatatype" },
-                "description" : 
-                { "title" : "Relevant Evidence Description",
-                  "description" : "A human-readable description of this evidence.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "description" ],
-              "additionalProperties" : false } },
-          "collected" : 
-          { "title" : "Collected Field",
-            "description" : "Date/time stamp identifying when the finding information was collected.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "expires" : 
-          { "title" : "Expires Field",
-            "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
+        { "date" : 
+         { "title" : "On Date Condition",
+          "description" : "The task must occur on the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "uuid",
-          "description",
-          "methods",
-          "collected" ],
+        [ "date" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:origin" : 
-      { "title" : "Origin",
-        "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
-        "$id" : "#assembly_oscal-assessment-common_origin",
+       "within-date-range" : 
+       { "title" : "On Date Range Condition",
+        "description" : "The task is intended to occur within the specified date range.",
         "type" : "object",
         "properties" : 
-        { "actors" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
-          "related-tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
+        { "start" : 
+         { "title" : "Start Date Condition",
+          "description" : "The task must occur on or after the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+         "end" : 
+         { "title" : "End Date Condition",
+          "description" : "The task must occur on or before the specified date.",
+          "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" } },
         "required" : 
-        [ "actors" ],
+        [ "start",
+         "end" ],
         "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:origin-actor" : 
-      { "title" : "Originating Actor",
-        "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
-        "$id" : "#assembly_oscal-assessment-common_origin-actor",
+       "at-frequency" : 
+       { "title" : "Frequency Condition",
+        "description" : "The task is intended to occur at the specified frequency.",
         "type" : "object",
         "properties" : 
-        { "type" : 
-          { "title" : "Actor Type",
-            "description" : "The kind of actor.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "tool",
-                  "assessment-platform",
-                  "party" ] } ] },
-          "actor-uuid" : 
-          { "title" : "Actor Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
+        { "period" : 
+         { "title" : "Period",
+          "description" : "The task must occur after the specified period has elapsed.",
+          "$ref" : "#/definitions/PositiveIntegerDatatype" },
+         "unit" : 
+         { "title" : "Time Unit",
+          "description" : "The unit of time for the period.",
+          "allOf" : 
+          [ 
+           { "$ref" : "#/definitions/StringDatatype" },
+           
+           { "enum" : 
+            [ "seconds",
+             "minutes",
+             "hours",
+             "days",
+             "months",
+             "years" ] } ] } },
         "required" : 
-        [ "type",
-          "actor-uuid" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:related-task" : 
-      { "title" : "Task Reference",
-        "description" : "Identifies an individual task for which the containing object is a consequence of.",
-        "$id" : "#assembly_oscal-assessment-common_related-task",
-        "type" : "object",
-        "properties" : 
-        { "task-uuid" : 
-          { "title" : "Task Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to a unique task.",
+        [ "period",
+         "unit" ],
+        "additionalProperties" : false } },
+      "additionalProperties" : false },
+     "dependencies" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Task Dependency",
+       "description" : "Used to indicate that a task is dependent on another task.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a unique task.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "associated-activities" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Activity",
+       "description" : "Identifies an individual activity to be performed as part of a task.",
+       "type" : "object",
+       "properties" : 
+       { "activity-uuid" : 
+        { "title" : "Activity Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an activity defined in the list of activities.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "activity-uuid",
+        "subjects" ],
+       "additionalProperties" : false } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:reviewed-controls" : 
+   { "title" : "Reviewed Controls and Control Objectives",
+    "description" : "Identifies the controls being assessed and their control objectives.",
+    "$id" : "#assembly_oscal-assessment-common_reviewed-controls",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Control Objective Description",
+      "description" : "A human-readable description of control objectives.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "control-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessed Controls",
+       "description" : "Identifies the controls being assessed. In the assessment plan, these are the planned controls. In the assessment results, these are the actual controls, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Assessed Controls Description",
+         "description" : "A human-readable description of in-scope controls specified for assessment.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "exclude-controls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-control-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "control-objective-selections" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Referenced Control Objectives",
+       "description" : "Identifies the control objectives of the assessment. In the assessment plan, these are the planned objectives. In the assessment results, these are the assessed objectives, and reflects any changes from the plan.",
+       "type" : "object",
+       "properties" : 
+       { "description" : 
+        { "title" : "Control Objectives Description",
+         "description" : "A human-readable description of this collection of control objectives.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "include-all" : 
+        { "$ref" : "#assembly_oscal-control-common_include-all" },
+        "include-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "exclude-objectives" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_select-objective-by-id" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "control-selections" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:select-control-by-id" : 
+   { "title" : "Select Control",
+    "description" : "Used to select a control for inclusion/exclusion based on one or more control identifiers. A set of statement identifiers can be used to target the inclusion/exclusion to only specific control statements providing more granularity over the specific statements that are within the asessment scope.",
+    "$id" : "#assembly_oscal-assessment-common_select-control-by-id",
+    "type" : "object",
+    "properties" : 
+    { "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "statement-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Include Specific Statements",
+       "description" : "Used to constrain the selection to only specificity identified statements.",
+       "$ref" : "#/definitions/TokenDatatype" } } },
+    "required" : 
+    [ "control-id" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:select-objective-by-id" : 
+   { "title" : "Select Objective",
+    "description" : "Used to select a control objective for inclusion/exclusion based on the control objective's identifier.",
+    "$id" : "#assembly_oscal-assessment-common_select-objective-by-id",
+    "type" : "object",
+    "properties" : 
+    { "objective-id" : 
+     { "title" : "Objective ID",
+      "description" : "Points to an assessment objective.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "objective-id" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:assessment-subject-placeholder" : 
+   { "title" : "Assessment Subject Placeholder",
+    "description" : "Used when the assessment subjects will be determined as part of one or more other assessment activities. These assessment subjects will be recorded in the assessment results in the assessment log.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject-placeholder",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Assessment Subject Placeholder Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Assessment Subject Placeholder Description",
+      "description" : "A human-readable description of intent of this assessment subject placeholder.",
+      "type" : "string" },
+     "sources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Subject Source",
+       "description" : "Assessment subjects will be identified while conducting the referenced activity-instance.",
+       "type" : "object",
+       "properties" : 
+       { "task-uuid" : 
+        { "title" : "Task Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "task-uuid" ],
+       "additionalProperties" : false } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "sources" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:assessment-subject" : 
+   { "title" : "Subject of Assessment",
+    "description" : "Identifies system elements being assessed, such as components, inventory items, and locations. In the assessment plan, this identifies a planned assessment subject. In the assessment results this is an actual assessment subject, and reflects any changes from the plan. exactly what will be the focus of this assessment. Any subjects not identified in this way are out-of-scope.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-subject",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Subject Type",
+      "description" : "Indicates the type of assessment subject, such as a component, inventory, item, location, or party represented by this selection statement.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user" ] } ] },
+     "description" : 
+     { "title" : "Include Subjects Description",
+      "description" : "A human-readable description of the collection of subjects being included in this assessment.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "exclude-subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_select-subject-by-id" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:select-subject-by-id" : 
+   { "title" : "Select Assessment Subject",
+    "description" : "Identifies a set of assessment subjects to include/exclude by UUID.",
+    "$id" : "#assembly_oscal-assessment-common_select-subject-by-id",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:subject-reference" : 
+   { "title" : "Identifies the Subject",
+    "description" : "A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.",
+    "$id" : "#assembly_oscal-assessment-common_subject-reference",
+    "type" : "object",
+    "properties" : 
+    { "subject-uuid" : 
+     { "title" : "Subject Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Subject Universally Unique Identifier Reference Type",
+      "description" : "Used to indicate the type of object pointed to by the uuid-ref within a subject.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "component",
+         "inventory-item",
+         "location",
+         "party",
+         "user",
+         "resource" ] } ] },
+     "title" : 
+     { "title" : "Subject Reference Title",
+      "description" : "The title or name for the referenced subject.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "subject-uuid",
+     "type" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:assessment-assets" : 
+   { "title" : "Assessment Assets",
+    "description" : "Identifies the assets used to perform this assessment, such as the assessment team, scanning tools, and assumptions.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-assets",
+    "type" : "object",
+    "properties" : 
+    { "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "assessment-platforms" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Assessment Platform",
+       "description" : "Used to represent the toolset used to perform aspects of the assessment.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Assessment Platform Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Assessment Platform Title",
+         "description" : "The title or name for the assessment platform.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "uses-components" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Uses Component",
+          "description" : "The set of components that are used by the assessment platform.",
+          "type" : "object",
+          "properties" : 
+          { "component-uuid" : 
+           { "title" : "Component Universally Unique Identifier Reference",
+            "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
             "$ref" : "#/definitions/UUIDDatatype" },
-          "props" : 
-          { "type" : "array",
+           "props" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
+           "links" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
+           "responsible-parties" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "subjects" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
-          "identified-subject" : 
-          { "title" : "Identified Subject",
-            "description" : "Used to detail assessment subjects that were identfied by this task.",
-            "type" : "object",
-            "properties" : 
-            { "subject-placeholder-uuid" : 
-              { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
-                "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
-                "$ref" : "#/definitions/UUIDDatatype" },
-              "subjects" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
-            "required" : 
-            [ "subject-placeholder-uuid",
-              "subjects" ],
-            "additionalProperties" : false },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "task-uuid" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:threat-id" : 
-      { "title" : "Threat ID",
-        "description" : "A pointer, by ID, to an externally-defined threat.",
-        "$id" : "#field_oscal-assessment-common_threat-id",
-        "type" : "object",
-        "properties" : 
-        { "system" : 
-          { "title" : "Threat Type Identification System",
-            "description" : "Specifies the source of the threat information.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal" ] } ] },
-          "href" : 
-          { "title" : "Threat Information Resource Reference",
-            "description" : "An optional location for the threat data, from which this ID originates.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "id" : 
-          { "$ref" : "#/definitions/URIDatatype" } },
-        "required" : 
-        [ "id",
-          "system" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:risk" : 
-      { "title" : "Identified Risk",
-        "description" : "An identified risk.",
-        "$id" : "#assembly_oscal-assessment-common_risk",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Risk Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
+           "remarks" : 
+           { "$ref" : "#field_oscal-metadata_remarks" } },
+          "required" : 
+          [ "component-uuid" ],
+          "additionalProperties" : false } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "assessment-platforms" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:finding-target" : 
+   { "title" : "Objective Status",
+    "description" : "Captures an assessor's conclusions regarding the degree to which an objective is satisfied.",
+    "$id" : "#assembly_oscal-assessment-common_finding-target",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Finding Target Type",
+      "description" : "Identifies the type of the target.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "statement-id",
+         "objective-id" ] } ] },
+     "target-id" : 
+     { "title" : "Finding Target Identifier Reference",
+      "description" : "A machine-oriented identifier reference for a specific target qualified by the type.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Objective Status Title",
+      "description" : "The title for this objective status.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Objective Status Description",
+      "description" : "A human-readable description of the assessor's conclusions regarding the degree to which an objective is satisfied.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Objective Status",
+      "description" : "A determination of if the objective is satisfied or not within a given system.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "Objective Status State",
+        "description" : "An indication as to whether the objective is satisfied or not.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "satisfied",
+           "not-satisfied" ] } ] },
+       "reason" : 
+       { "title" : "Objective Status Reason",
+        "description" : "The reason the objective was given it's status.",
+        "anyOf" : 
+        [ 
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "pass",
+           "fail",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "implementation-status" : 
+     { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "type",
+     "target-id",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:finding" : 
+   { "title" : "Finding",
+    "description" : "Describes an individual finding.",
+    "$id" : "#assembly_oscal-assessment-common_finding",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Finding Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Finding Title",
+      "description" : "The title for this finding.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Finding Description",
+      "description" : "A human-readable description of this finding.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "target" : 
+     { "$ref" : "#assembly_oscal-assessment-common_finding-target" },
+     "implementation-statement-uuid" : 
+     { "title" : "Implementation Statement UUID",
+      "description" : "A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } },
+     "related-risks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Associated Risk",
+       "description" : "Relates the finding to a set of referenced risks that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "risk-uuid" : 
+        { "title" : "Risk Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a risk defined in the list of risks.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "risk-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "target" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:observation" : 
+   { "title" : "Observation",
+    "description" : "Describes an individual observation.",
+    "$id" : "#assembly_oscal-assessment-common_observation",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Observation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Observation Title",
+      "description" : "The title for this observation.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Observation Description",
+      "description" : "A human-readable description of this assessment observation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "methods" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Method",
+       "description" : "Identifies how the observation was made.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/StringDatatype" },
+        
+        { "enum" : 
+         [ "EXAMINE",
+          "INTERVIEW",
+          "TEST",
+          "UNKNOWN" ] } ] } },
+     "types" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Observation Type",
+       "description" : "Identifies the nature of the observation. More than one may be used to further qualify and enable filtering.",
+       "anyOf" : 
+       [ 
+        { "$ref" : "#/definitions/TokenDatatype" },
+        
+        { "enum" : 
+         [ "ssp-statement-issue",
+          "control-objective",
+          "mitigation",
+          "finding",
+          "historic" ] } ] } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+     "relevant-evidence" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Relevant Evidence",
+       "description" : "Links this observation to relevant evidence.",
+       "type" : "object",
+       "properties" : 
+       { "href" : 
+        { "title" : "Relevant Evidence Reference",
+         "description" : "A resolvable URL reference to relevant evidence.",
+         "$ref" : "#/definitions/URIReferenceDatatype" },
+        "description" : 
+        { "title" : "Relevant Evidence Description",
+         "description" : "A human-readable description of this evidence.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "description" ],
+       "additionalProperties" : false } },
+     "collected" : 
+     { "title" : "Collected Field",
+      "description" : "Date/time stamp identifying when the finding information was collected.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "expires" : 
+     { "title" : "Expires Field",
+      "description" : "Date/time identifying when the finding information is out-of-date and no longer valid. Typically used with continuous assessment scenarios.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description",
+     "methods",
+     "collected" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:origin" : 
+   { "title" : "Origin",
+    "description" : "Identifies the source of the finding, such as a tool, interviewed person, or activity.",
+    "$id" : "#assembly_oscal-assessment-common_origin",
+    "type" : "object",
+    "properties" : 
+    { "actors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin-actor" } },
+     "related-tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_related-task" } } },
+    "required" : 
+    [ "actors" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:origin-actor" : 
+   { "title" : "Originating Actor",
+    "description" : "The actor that produces an observation, a finding, or a risk. One or more actor type can be used to specify a person that is using a tool.",
+    "$id" : "#assembly_oscal-assessment-common_origin-actor",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Actor Type",
+      "description" : "The kind of actor.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "tool",
+         "assessment-platform",
+         "party" ] } ] },
+     "actor-uuid" : 
+     { "title" : "Actor Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to the tool or person based on the associated type.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "For a party, this can optionally be used to specify the role the actor was performing.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "type",
+     "actor-uuid" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:related-task" : 
+   { "title" : "Task Reference",
+    "description" : "Identifies an individual task for which the containing object is a consequence of.",
+    "$id" : "#assembly_oscal-assessment-common_related-task",
+    "type" : "object",
+    "properties" : 
+    { "task-uuid" : 
+     { "title" : "Task Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to a unique task.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "subjects" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } },
+     "identified-subject" : 
+     { "title" : "Identified Subject",
+      "description" : "Used to detail assessment subjects that were identfied by this task.",
+      "type" : "object",
+      "properties" : 
+      { "subject-placeholder-uuid" : 
+       { "title" : "Assessment Subject Placeholder Universally Unique Identifier Reference",
+        "description" : "A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.",
+        "$ref" : "#/definitions/UUIDDatatype" },
+       "subjects" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-assessment-common_assessment-subject" } } },
+      "required" : 
+      [ "subject-placeholder-uuid",
+       "subjects" ],
+      "additionalProperties" : false },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "task-uuid" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:threat-id" : 
+   { "title" : "Threat ID",
+    "description" : "A pointer, by ID, to an externally-defined threat.",
+    "$id" : "#field_oscal-assessment-common_threat-id",
+    "type" : "object",
+    "properties" : 
+    { "system" : 
+     { "title" : "Threat Type Identification System",
+      "description" : "Specifies the source of the threat information.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://fedramp.gov",
+         "http://fedramp.gov/ns/oscal" ] } ] },
+     "href" : 
+     { "title" : "Threat Information Resource Reference",
+      "description" : "An optional location for the threat data, from which this ID originates.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "id" : 
+     { "$ref" : "#/definitions/URIDatatype" } },
+    "required" : 
+    [ "id",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:risk" : 
+   { "title" : "Identified Risk",
+    "description" : "An identified risk.",
+    "$id" : "#assembly_oscal-assessment-common_risk",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Risk Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "Risk Title",
+      "description" : "The title for this risk.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Risk Description",
+      "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
+      "type" : "string" },
+     "statement" : 
+     { "title" : "Risk Statement",
+      "description" : "An summary of impact for how the risk affects the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "$ref" : "#field_oscal-assessment-common_risk-status" },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "threat-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-assessment-common_threat-id" } },
+     "characterizations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
+     "mitigating-factors" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Mitigating Factor",
+       "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Mitigating Factor Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "implementation-uuid" : 
+        { "title" : "Implementation UUID",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Mitigating Factor Description",
+         "description" : "A human-readable description of this mitigating factor.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "deadline" : 
+     { "title" : "Risk Resolution Deadline",
+      "description" : "The date/time by which the risk must be resolved.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "remediations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_response" } },
+     "risk-log" : 
+     { "title" : "Risk Log",
+      "description" : "A log of all risk-related tasks taken.",
+      "type" : "object",
+      "properties" : 
+      { "entries" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Risk Log Entry",
+         "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Risk Log Entry Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "title" : 
-          { "title" : "Risk Title",
-            "description" : "The title for this risk.",
-            "type" : "string" },
+          { "title" : "Title",
+           "description" : "The title for this risk log entry.",
+           "type" : "string" },
           "description" : 
-          { "title" : "Risk Description",
-            "description" : "A human-readable summary of the identified risk, to include a statement of how the risk impacts the system.",
-            "type" : "string" },
-          "statement" : 
-          { "title" : "Risk Statement",
-            "description" : "An summary of impact for how the risk affects the system.",
-            "type" : "string" },
+          { "title" : "Risk Task Description",
+           "description" : "A human-readable description of what was done regarding the risk.",
+           "type" : "string" },
+          "start" : 
+          { "title" : "Start",
+           "description" : "Identifies the start date and time of the event.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+          "end" : 
+          { "title" : "End",
+           "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
+           "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "$ref" : "#field_oscal-assessment-common_risk-status" },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "threat-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-assessment-common_threat-id" } },
-          "characterizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_characterization" } },
-          "mitigating-factors" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "logged-by" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Mitigating Factor",
-              "description" : "Describes an existing mitigating factor that may affect the overall determination of the risk, with an optional link to an implementation statement in the SSP.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Mitigating Factor Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "implementation-uuid" : 
-                { "title" : "Implementation UUID",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Mitigating Factor Description",
-                  "description" : "A human-readable description of this mitigating factor.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "deadline" : 
-          { "title" : "Risk Resolution Deadline",
-            "description" : "The date/time by which the risk must be resolved.",
-            "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-          "remediations" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
+          "status-change" : 
+          { "$ref" : "#field_oscal-assessment-common_risk-status" },
+          "related-responses" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_response" } },
-          "risk-log" : 
-          { "title" : "Risk Log",
-            "description" : "A log of all risk-related tasks taken.",
+           "minItems" : 1,
+           "items" : 
+           { "title" : "Risk Response Reference",
+            "description" : "Identifies an individual risk response that this log entry is for.",
             "type" : "object",
             "properties" : 
-            { "entries" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Risk Log Entry",
-                  "description" : "Identifies an individual risk response that occurred as part of managing an identified risk.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Risk Log Entry Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "title" : 
-                    { "title" : "Title",
-                      "description" : "The title for this risk log entry.",
-                      "type" : "string" },
-                    "description" : 
-                    { "title" : "Risk Task Description",
-                      "description" : "A human-readable description of what was done regarding the risk.",
-                      "type" : "string" },
-                    "start" : 
-                    { "title" : "Start",
-                      "description" : "Identifies the start date and time of the event.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "end" : 
-                    { "title" : "End",
-                      "description" : "Identifies the end date and time of the event. If the event is a point in time, the start and end will be the same date and time.",
-                      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "logged-by" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-assessment-common_logged-by" } },
-                    "status-change" : 
-                    { "$ref" : "#field_oscal-assessment-common_risk-status" },
-                    "related-responses" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "title" : "Risk Response Reference",
-                        "description" : "Identifies an individual risk response that this log entry is for.",
-                        "type" : "object",
-                        "properties" : 
-                        { "response-uuid" : 
-                          { "title" : "Response Universally Unique Identifier Reference",
-                            "description" : "A machine-oriented identifier reference to a unique risk response.",
-                            "$ref" : "#/definitions/UUIDDatatype" },
-                          "props" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_property" } },
-                          "links" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-metadata_link" } },
-                          "related-tasks" : 
-                          { "type" : "array",
-                            "minItems" : 1,
-                            "items" : 
-                            { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
-                          "remarks" : 
-                          { "$ref" : "#field_oscal-metadata_remarks" } },
-                        "required" : 
-                        [ "response-uuid" ],
-                        "additionalProperties" : false } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "start" ],
-                  "additionalProperties" : false } } },
+            { "response-uuid" : 
+             { "title" : "Response Universally Unique Identifier Reference",
+              "description" : "A machine-oriented identifier reference to a unique risk response.",
+              "$ref" : "#/definitions/UUIDDatatype" },
+             "props" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_property" } },
+             "links" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-metadata_link" } },
+             "related-tasks" : 
+             { "type" : "array",
+              "minItems" : 1,
+              "items" : 
+              { "$ref" : "#assembly_oscal-assessment-common_related-task" } },
+             "remarks" : 
+             { "$ref" : "#field_oscal-metadata_remarks" } },
             "required" : 
-            [ "entries" ],
-            "additionalProperties" : false },
-          "related-observations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Related Observation",
-              "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
-              "type" : "object",
-              "properties" : 
-              { "observation-uuid" : 
-                { "title" : "Observation Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
-                  "$ref" : "#/definitions/UUIDDatatype" } },
-              "required" : 
-              [ "observation-uuid" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "uuid",
-          "title",
-          "description",
-          "statement",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:logged-by" : 
-      { "title" : "Logged By",
-        "description" : "Used to indicate who created a log entry in what role.",
-        "$id" : "#assembly_oscal-assessment-common_logged-by",
-        "type" : "object",
-        "properties" : 
-        { "party-uuid" : 
-          { "title" : "Party UUID Reference",
-            "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "role-id" : 
-          { "title" : "Actor Role",
-            "description" : "A point to the role-id of the role in which the party is making the log entry.",
-            "$ref" : "#/definitions/TokenDatatype" } },
-        "required" : 
-        [ "party-uuid" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:risk-status" : 
-      { "title" : "Risk Status",
-        "description" : "Describes the status of the associated risk.",
-        "$id" : "#field_oscal-assessment-common_risk-status",
-        "anyOf" : 
-        [ 
-          { "$ref" : "#/definitions/TokenDatatype" },
-          
-          { "enum" : 
-            [ "open",
-              "investigating",
-              "remediating",
-              "deviation-requested",
-              "deviation-approved",
-              "closed" ] } ] },
-      "oscal-poam-oscal-assessment-common:characterization" : 
-      { "title" : "Characterization",
-        "description" : "A collection of descriptive data about the containing object from a specific origin.",
-        "$id" : "#assembly_oscal-assessment-common_characterization",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origin" : 
-          { "$ref" : "#assembly_oscal-assessment-common_origin" },
-          "facets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Facet",
-              "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
-              "type" : "object",
-              "properties" : 
-              { "name" : 
-                { "title" : "Facet Name",
-                  "description" : "The name of the risk metric within the specified system.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "system" : 
-                { "title" : "Naming System",
-                  "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://fedramp.gov",
-                        "http://fedramp.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal",
-                        "http://csrc.nist.gov/ns/oscal/unknown",
-                        "http://cve.mitre.org",
-                        "http://www.first.org/cvss/v2.0",
-                        "http://www.first.org/cvss/v3.0",
-                        "http://www.first.org/cvss/v3.1" ] } ] },
-                "value" : 
-                { "title" : "Facet Value",
-                  "description" : "Indicates the value of the facet.",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "name",
-                "system",
-                "value" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "origin",
-          "facets" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:response" : 
-      { "title" : "Risk Response",
-        "description" : "Describes either recommended or an actual plan for addressing the risk.",
-        "$id" : "#assembly_oscal-assessment-common_response",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Remediation Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "lifecycle" : 
-          { "title" : "Remediation Intent",
-            "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "recommendation",
-                  "planned",
-                  "completed" ] } ] },
-          "title" : 
-          { "title" : "Response Title",
-            "description" : "The title for this response activity.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Response Description",
-            "description" : "A human-readable description of this response plan.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "origins" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_origin" } },
-          "required-assets" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Required Asset",
-              "description" : "Identifies an asset required to achieve remediation.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Required Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "subjects" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
-                "title" : 
-                { "title" : "Title for Required Asset",
-                  "description" : "The title for this required asset.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Description of Required Asset",
-                  "description" : "A human-readable description of this required asset.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "tasks" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_task" } },
+            [ "response-uuid" ],
+            "additionalProperties" : false } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "lifecycle",
-          "title",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-poam-oscal-assessment-common:assessment-part" : 
-      { "title" : "Assessment Part",
-        "description" : "A partition of an assessment plan or results or a child of another part.",
-        "$id" : "#assembly_oscal-assessment-common_assessment-part",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Part Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "asset",
-                  "method",
-                  "objective" ] } ] },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "IntegerDatatype" : 
-      { "description" : "A whole number value.",
-        "type" : "integer" },
-      "NonNegativeIntegerDatatype" : 
-      { "description" : "An integer value that is equal to or greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 0 } ] },
-      "PositiveIntegerDatatype" : 
-      { "description" : "An integer value that is greater than 0.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
+         "required" : 
+         [ "uuid",
+          "start" ],
+         "additionalProperties" : false } } },
+      "required" : 
+      [ "entries" ],
+      "additionalProperties" : false },
+     "related-observations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Related Observation",
+       "description" : "Relates the finding to a set of referenced observations that were used to determine the finding.",
+       "type" : "object",
+       "properties" : 
+       { "observation-uuid" : 
+        { "title" : "Observation Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to an observation defined in the list of observations.",
+         "$ref" : "#/definitions/UUIDDatatype" } },
+       "required" : 
+       [ "observation-uuid" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "uuid",
+     "title",
+     "description",
+     "statement",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:logged-by" : 
+   { "title" : "Logged By",
+    "description" : "Used to indicate who created a log entry in what role.",
+    "$id" : "#assembly_oscal-assessment-common_logged-by",
+    "type" : "object",
+    "properties" : 
+    { "party-uuid" : 
+     { "title" : "Party UUID Reference",
+      "description" : "A machine-oriented identifier reference to the party who is making the log entry.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "role-id" : 
+     { "title" : "Actor Role",
+      "description" : "A point to the role-id of the role in which the party is making the log entry.",
+      "$ref" : "#/definitions/TokenDatatype" } },
+    "required" : 
+    [ "party-uuid" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:risk-status" : 
+   { "title" : "Risk Status",
+    "description" : "Describes the status of the associated risk.",
+    "$id" : "#field_oscal-assessment-common_risk-status",
+    "anyOf" : 
+    [ 
+     { "$ref" : "#/definitions/TokenDatatype" },
+     
+     { "enum" : 
+      [ "open",
+       "investigating",
+       "remediating",
+       "deviation-requested",
+       "deviation-approved",
+       "closed" ] } ] },
+   "oscal-poam-oscal-assessment-common:characterization" : 
+   { "title" : "Characterization",
+    "description" : "A collection of descriptive data about the containing object from a specific origin.",
+    "$id" : "#assembly_oscal-assessment-common_characterization",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origin" : 
+     { "$ref" : "#assembly_oscal-assessment-common_origin" },
+     "facets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Facet",
+       "description" : "An individual characteristic that is part of a larger set produced by the same actor.",
+       "type" : "object",
+       "properties" : 
+       { "name" : 
+        { "title" : "Facet Name",
+         "description" : "The name of the risk metric within the specified system.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "system" : 
+        { "title" : "Naming System",
+         "description" : "Specifies the naming system under which this risk metric is organized, which allows for the same names to be used in different systems controlled by different parties. This avoids the potential of a name clash.",
+         "anyOf" : 
+         [ 
+          { "$ref" : "#/definitions/URIDatatype" },
           
-          { "type" : "number",
-            "minimum" : 1 } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+          { "enum" : 
+           [ "http://fedramp.gov",
+            "http://fedramp.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal",
+            "http://csrc.nist.gov/ns/oscal/unknown",
+            "http://cve.mitre.org",
+            "http://www.first.org/cvss/v2.0",
+            "http://www.first.org/cvss/v3.0",
+            "http://www.first.org/cvss/v3.1" ] } ] },
+        "value" : 
+        { "title" : "Facet Value",
+         "description" : "Indicates the value of the facet.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "name",
+        "system",
+        "value" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "origin",
+     "facets" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:response" : 
+   { "title" : "Risk Response",
+    "description" : "Describes either recommended or an actual plan for addressing the risk.",
+    "$id" : "#assembly_oscal-assessment-common_response",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Remediation Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "lifecycle" : 
+     { "title" : "Remediation Intent",
+      "description" : "Identifies whether this is a recommendation, such as from an assessor or tool, or an actual plan accepted by the system owner.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "recommendation",
+         "planned",
+         "completed" ] } ] },
+     "title" : 
+     { "title" : "Response Title",
+      "description" : "The title for this response activity.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Response Description",
+      "description" : "A human-readable description of this response plan.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "origins" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_origin" } },
+     "required-assets" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Required Asset",
+       "description" : "Identifies an asset required to achieve remediation.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Required Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "subjects" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-assessment-common_subject-reference" } },
+        "title" : 
+        { "title" : "Title for Required Asset",
+         "description" : "The title for this required asset.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Description of Required Asset",
+         "description" : "A human-readable description of this required asset.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "tasks" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_task" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "lifecycle",
+     "title",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-poam-oscal-assessment-common:assessment-part" : 
+   { "title" : "Assessment Part",
+    "description" : "A partition of an assessment plan or results or a child of another part.",
+    "$id" : "#assembly_oscal-assessment-common_assessment-part",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "plan-of-action-and-milestones" : 
-      { "$ref" : "#assembly_oscal-poam_plan-of-action-and-milestones" } },
+    { "uuid" : 
+     { "title" : "Part Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "asset",
+         "method",
+         "objective" ] } ] },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "A name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-assessment-common_assessment-part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
     "required" : 
-    [ "plan-of-action-and-milestones" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "name" ],
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "IntegerDatatype" : 
+   { "description" : "A whole number value.",
+    "type" : "integer" },
+   "NonNegativeIntegerDatatype" : 
+   { "description" : "An integer value that is equal to or greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 0 } ] },
+   "PositiveIntegerDatatype" : 
+   { "description" : "An integer value that is greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 1 } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "plan-of-action-and-milestones" : 
+   { "$ref" : "#assembly_oscal-poam_plan-of-action-and-milestones" } },
+  "required" : 
+  [ "plan-of-action-and-milestones" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_profile_schema.json b/json/schema/oscal_profile_schema.json
index a6b69ada83..75f473a0c5 100644
--- a/json/schema/oscal_profile_schema.json
+++ b/json/schema/oscal_profile_schema.json
@@ -1,1303 +1,1349 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-profile-schema.json",
-    "$comment" : "OSCAL Profile Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-profile-schema.json",
+  "$comment" : "OSCAL Profile Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-profile-oscal-profile:profile" : 
+   { "title" : "Profile",
+    "description" : "Each OSCAL profile is defined by a profile element.",
+    "$id" : "#assembly_oscal-profile_profile",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-profile-oscal-profile:profile" : 
-      { "title" : "Profile",
-        "description" : "Each OSCAL profile is defined by a Profile element",
-        "$id" : "#assembly_oscal-profile_profile",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Profile Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this profile elsewhere in this or other OSCAL instances. The locally defined UUID of the profile can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This identifier should be assigned per-subject, which means it should be consistently used to identify the same profile across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "imports" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_import" } },
-          "merge" : 
-          { "$ref" : "#assembly_oscal-profile_merge" },
-          "modify" : 
-          { "$ref" : "#assembly_oscal-profile_modify" },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "imports" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:import" : 
-      { "title" : "Import resource",
-        "description" : "The import designates a catalog or profile to be included (referenced and potentially modified) by this profile. The import also identifies which controls to select using the include-all, include-controls, and exclude-controls directives.",
-        "$id" : "#assembly_oscal-profile_import",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Catalog or Profile Reference",
-            "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
-          "exclude-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:merge" : 
-      { "title" : "Merge controls",
-        "description" : "A Merge element provides structuring directives that drive how controls are organized after resolution.",
-        "$id" : "#assembly_oscal-profile_merge",
-        "type" : "object",
-        "properties" : 
-        { "combine" : 
-          { "title" : "Combination rule",
-            "description" : "A Combine element defines how to combine multiple (competing) versions of the same control.",
-            "type" : "object",
-            "properties" : 
-            { "method" : 
-              { "title" : "Combination method",
-                "description" : "How clashing controls should be handled",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/StringDatatype" },
-                  
-                  { "enum" : 
-                    [ "use-first",
-                      "merge",
-                      "keep" ] } ] } },
-            "additionalProperties" : false },
-          "flat" : 
-          { "title" : "Flat",
-            "description" : "Use the flat structuring method.",
-            "type" : "object",
-            "additionalProperties" : false },
-          "as-is" : 
-          { "title" : "As-Is Structuring Directive",
-            "description" : "An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.",
-            "$ref" : "#/definitions/BooleanDatatype" },
-          "custom" : 
-          { "title" : "Custom grouping",
-            "description" : "A Custom element frames a structure for embedding represented controls in resolution.",
-            "type" : "object",
-            "properties" : 
-            { "groups" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-profile_group" } },
-              "insert-controls" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
-            "additionalProperties" : false } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:group" : 
-      { "title" : "Control group",
-        "description" : "A group of (selected) controls or of groups of controls",
-        "$id" : "#assembly_oscal-profile_group",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Group Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Group Class",
-            "description" : "A textual label that provides a sub-type or characterization of the group.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Group Title",
-            "description" : "A name given to the group, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "groups" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_group" } },
-          "insert-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
-        "required" : 
-        [ "title" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:modify" : 
-      { "title" : "Modify controls",
-        "description" : "Set parameters or amend controls in resolution",
-        "$id" : "#assembly_oscal-profile_modify",
-        "type" : "object",
-        "properties" : 
-        { "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Setting",
-              "description" : "A parameter setting, to be propagated to points of insertion",
-              "type" : "object",
-              "properties" : 
-              { "param-id" : 
-                { "title" : "Parameter ID",
-                  "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "class" : 
-                { "title" : "Parameter Class",
-                  "description" : "A textual label that provides a characterization of the parameter.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "depends-on" : 
-                { "title" : "Depends on",
-                  "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-                  "$ref" : "#/definitions/TokenDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "label" : 
-                { "title" : "Parameter Label",
-                  "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-                  "type" : "string" },
-                "usage" : 
-                { "title" : "Parameter Usage Description",
-                  "description" : "Describes the purpose and use of a parameter",
-                  "type" : "string" },
-                "constraints" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-                "guidelines" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-                "values" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-                "select" : 
-                { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" } },
-              "required" : 
-              [ "param-id" ],
-              "additionalProperties" : false } },
-          "alters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_alter" } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:insert-controls" : 
-      { "title" : "Select controls",
-        "description" : "Specifies which controls to use in the containing context.",
-        "$id" : "#assembly_oscal-profile_insert-controls",
-        "type" : "object",
-        "properties" : 
-        { "order" : 
-          { "title" : "Order",
-            "description" : "A designation of how a selection of controls in a profile is to be ordered.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "keep",
-                  "ascending",
-                  "descending" ] } ] },
-          "include-all" : 
-          { "$ref" : "#assembly_oscal-catalog-common_include-all" },
-          "include-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
-          "exclude-controls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:select-control-by-id" : 
-      { "title" : "Call",
-        "description" : "Call a control by its ID",
-        "$id" : "#assembly_oscal-profile_select-control-by-id",
-        "type" : "object",
-        "properties" : 
-        { "with-child-controls" : 
-          { "title" : "Include contained controls with control",
-            "description" : "When a control is included, whether its child (dependent) controls are also included.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "yes",
-                  "no" ] } ] },
-          "with-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Match Controls by Identifier",
-              "description" : "",
-              "$ref" : "#/definitions/TokenDatatype" } },
-          "matching" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Match Controls by Pattern",
-              "description" : "Select controls by (regular expression) match on ID",
-              "type" : "object",
-              "properties" : 
-              { "pattern" : 
-                { "title" : "Pattern",
-                  "description" : "A glob expression matching the IDs of one or more controls to be selected.",
-                  "$ref" : "#/definitions/StringDatatype" } },
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:alter" : 
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Profile Universally Unique Identifier",
+      "description" : "Provides a globally unique means to identify a given profile instance.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "imports" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_import" } },
+     "merge" : 
+     { "$ref" : "#assembly_oscal-profile_merge" },
+     "modify" : 
+     { "$ref" : "#assembly_oscal-profile_modify" },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "imports" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:import" : 
+   { "title" : "Import Resource",
+    "description" : "Designates a referenced source catalog or profile that provides a source of control information for use in creating a new overlay or baseline.",
+    "$id" : "#assembly_oscal-profile_import",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Catalog or Profile Reference",
+      "description" : "A resolvable URL reference to the base catalog or profile that this profile is tailoring.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
+     "exclude-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:merge" : 
+   { "title" : "Merge Controls",
+    "description" : "Provides structuring directives that instruct how controls are organized after profile resolution.",
+    "$id" : "#assembly_oscal-profile_merge",
+    "type" : "object",
+    "properties" : 
+    { "combine" : 
+     { "title" : "Combination Rule",
+      "description" : "A Combine element defines how to resolve duplicate instances of the same control (e.g., controls with the same ID).",
+      "type" : "object",
+      "properties" : 
+      { "method" : 
+       { "title" : "Combination Method",
+        "description" : "Declare how clashing controls should be handled.",
+        "allOf" : 
+        [ 
+         { "$ref" : "#/definitions/StringDatatype" },
+         
+         { "enum" : 
+          [ "use-first",
+           "merge",
+           "keep" ] } ] } },
+      "additionalProperties" : false },
+     "flat" : 
+     { "title" : "Flat Without Grouping",
+      "description" : "Directs that controls appear without any grouping structure.",
+      "type" : "object",
+      "additionalProperties" : false },
+     "as-is" : 
+     { "title" : "Group As-Is",
+      "description" : "Indicates that the controls selected should retain their original grouping as defined in the import source.",
+      "$ref" : "#/definitions/BooleanDatatype" },
+     "custom" : 
+     { "title" : "Custom Grouping",
+      "description" : "Provides an alternate grouping structure that selected controls will be placed in.",
+      "type" : "object",
+      "properties" : 
+      { "groups" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-profile_group" } },
+       "insert-controls" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
+      "additionalProperties" : false } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:group" : 
+   { "title" : "Control Group",
+    "description" : "A group of (selected) controls or of groups of controls.",
+    "$id" : "#assembly_oscal-profile_group",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Group Identifier",
+      "description" : "Identifies the group.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Group Class",
+      "description" : "A textual label that provides a sub-type or characterization of the group.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Group Title",
+      "description" : "A name to be given to the group for use in display.",
+      "type" : "string" },
+     "params" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "groups" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_group" } },
+     "insert-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_insert-controls" } } },
+    "required" : 
+    [ "title" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:modify" : 
+   { "title" : "Modify Controls",
+    "description" : "Set parameters or amend controls in resolution.",
+    "$id" : "#assembly_oscal-profile_modify",
+    "type" : "object",
+    "properties" : 
+    { "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Setting",
+       "description" : "A parameter setting, to be propagated to points of insertion.",
+       "type" : "object",
+       "properties" : 
+       { "param-id" : 
+        { "title" : "Parameter ID",
+         "description" : "An identifier for the parameter.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "class" : 
+        { "title" : "Parameter Class",
+         "description" : "A textual label that provides a characterization of the parameter.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "depends-on" : 
+        { "title" : "Depends On",
+         "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "label" : 
+        { "title" : "Parameter Label",
+         "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+         "type" : "string" },
+        "usage" : 
+        { "title" : "Parameter Usage Description",
+         "description" : "Describes the purpose and use of a parameter.",
+         "type" : "string" },
+        "constraints" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+        "guidelines" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+        "values" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-control-common_parameter-value" } },
+        "select" : 
+        { "$ref" : "#assembly_oscal-control-common_parameter-selection" } },
+       "required" : 
+       [ "param-id" ],
+       "additionalProperties" : false } },
+     "alters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Alteration",
-        "description" : "An Alter element specifies changes to be made to an included control when a profile is resolved.",
-        "$id" : "#assembly_oscal-profile_alter",
-        "type" : "object",
-        "properties" : 
-        { "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "removes" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_remove" } },
-          "adds" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-profile_add" } } },
-        "required" : 
-        [ "control-id" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:remove" : 
-      { "title" : "Removal",
-        "description" : "Specifies objects to be removed from a control based on specific aspects of the object that must all match.",
-        "$id" : "#assembly_oscal-profile_remove",
-        "type" : "object",
-        "properties" : 
-        { "by-name" : 
-          { "title" : "Reference by (assigned) name",
-            "description" : "Identify items to remove by matching their assigned name",
+       "description" : "Specifies changes to be made to an included control when a profile is resolved.",
+       "type" : "object",
+       "properties" : 
+       { "control-id" : 
+        { "title" : "Control Identifier Reference",
+         "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "removes" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Removal",
+          "description" : "Specifies objects to be removed from a control based on specific aspects of the object that must all match.",
+          "type" : "object",
+          "properties" : 
+          { "by-name" : 
+           { "title" : "Reference by (assigned) name",
+            "description" : "Identify items remove by matching their assigned name.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "by-class" : 
-          { "title" : "Reference by class",
+           "by-class" : 
+           { "title" : "Reference by class",
             "description" : "Identify items to remove by matching their class.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "by-id" : 
-          { "title" : "Reference by ID",
+           "by-id" : 
+           { "title" : "Reference by ID",
             "description" : "Identify items to remove indicated by their id.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "by-item-name" : 
-          { "title" : "Item Name Reference",
-            "description" : "Identify items to remove by the name of the item's information element name, e.g. title or prop",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "by-ns" : 
-          { "title" : "Item Namespace Reference",
+           "by-item-name" : 
+           { "title" : "Item Name Reference",
+            "description" : "Identify items to remove by the name of the item's information object name, e.g. title or prop.",
+            "allOf" : 
+            [ 
+             { "$ref" : "#/definitions/TokenDatatype" },
+             
+             { "enum" : 
+              [ "param",
+               "prop",
+               "link",
+               "part",
+               "mapping",
+               "map" ] } ] },
+           "by-ns" : 
+           { "title" : "Item Namespace Reference",
             "description" : "Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.",
             "$ref" : "#/definitions/TokenDatatype" } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-profile:add" : 
-      { "title" : "Addition",
-        "description" : "Specifies contents to be added into controls, in resolution",
-        "$id" : "#assembly_oscal-profile_add",
-        "type" : "object",
-        "properties" : 
-        { "position" : 
-          { "title" : "Position",
-            "description" : "Where to add the new content with respect to the targeted element (beside it or inside it)",
+          "additionalProperties" : false } },
+        "adds" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Addition",
+          "description" : "Specifies contents to be added into controls, in resolution.",
+          "type" : "object",
+          "properties" : 
+          { "position" : 
+           { "title" : "Position",
+            "description" : "Where to add the new content with respect to the targeted element (beside it or inside it).",
             "allOf" : 
             [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "before",
-                  "after",
-                  "starting",
-                  "ending" ] } ] },
-          "by-id" : 
-          { "title" : "Reference by ID",
+             { "$ref" : "#/definitions/TokenDatatype" },
+             
+             { "enum" : 
+              [ "before",
+               "after",
+               "starting",
+               "ending" ] } ] },
+           "by-id" : 
+           { "title" : "Reference by ID",
             "description" : "Target location of the addition.",
             "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Title Change",
+           "title" : 
+           { "title" : "Title Change",
             "description" : "A name given to the control, which may be used by a tool for display and navigation.",
             "type" : "string" },
-          "params" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
+           "params" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
+            { "$ref" : "#assembly_oscal-control-common_parameter" } },
+           "props" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
+           "links" : 
+           { "type" : "array",
             "minItems" : 1,
             "items" : 
             { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:revision" : 
+           "parts" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#assembly_oscal-control-common_part" } } },
+          "additionalProperties" : false } } },
+       "required" : 
+       [ "control-id" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:insert-controls" : 
+   { "title" : "Insert Controls",
+    "description" : "Specifies which controls to use in the containing context.",
+    "$id" : "#assembly_oscal-profile_insert-controls",
+    "type" : "object",
+    "properties" : 
+    { "order" : 
+     { "title" : "Order",
+      "description" : "A designation of how a selection of controls in a profile is to be ordered.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "keep",
+         "ascending",
+         "descending" ] } ] },
+     "include-all" : 
+     { "$ref" : "#assembly_oscal-control-common_include-all" },
+     "include-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } },
+     "exclude-controls" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_select-control-by-id" } } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:select-control-by-id" : 
+   { "title" : "Select Control",
+    "description" : "Select a control or controls from an imported control set.",
+    "$id" : "#assembly_oscal-profile_select-control-by-id",
+    "type" : "object",
+    "properties" : 
+    { "with-child-controls" : 
+     { "title" : "Include Contained Controls with Control",
+      "description" : "When a control is included, whether its child (dependent) controls are also included.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "yes",
+         "no" ] } ] },
+     "with-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-profile_with-id" } },
+     "matching" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-profile_matching" } } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-profile:with-id" : 
+   { "title" : "Match Controls by Identifier",
+    "description" : "Selecting a control by its ID given as a literal.",
+    "$id" : "#field_oscal-profile_with-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-profile-oscal-profile:matching" : 
+   { "title" : "Match Controls by Pattern",
+    "description" : "Selecting a set of controls by matching their IDs with a wildcard pattern.",
+    "$id" : "#assembly_oscal-profile_matching",
+    "type" : "object",
+    "properties" : 
+    { "pattern" : 
+     { "title" : "Pattern",
+      "description" : "A glob expression matching the IDs of one or more controls to be selected.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:location" : 
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
       { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-profile-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
+            "anyOf" : 
             [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-profile-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-profile-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-profile-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-profile-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-profile-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
             "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
           "media-type" : 
           { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
           "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
-        "type" : "string" },
-      "oscal-profile-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-profile-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-profile-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-profile-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-profile-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-profile-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-profile-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-profile-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-profile-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-profile-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "BooleanDatatype" : 
-      { "description" : "A binary value that is either: true or false.",
-        "type" : "boolean" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "profile" : 
-      { "$ref" : "#assembly_oscal-profile_profile" } },
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
     "required" : 
-    [ "profile" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-profile-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-profile-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-profile-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-profile-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-profile-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-profile-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-profile-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-profile-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-profile-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-profile-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "BooleanDatatype" : 
+   { "description" : "A binary value that is either: true or false.",
+    "type" : "boolean" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "profile" : 
+   { "$ref" : "#assembly_oscal-profile_profile" } },
+  "required" : 
+  [ "profile" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/json/schema/oscal_ssp_schema.json b/json/schema/oscal_ssp_schema.json
index 209d03aaea..e2369e094f 100644
--- a/json/schema/oscal_ssp_schema.json
+++ b/json/schema/oscal_ssp_schema.json
@@ -1,2162 +1,2157 @@
 
-  { "$schema" : "http://json-schema.org/draft-07/schema#",
-    "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-ssp-schema.json",
-    "$comment" : "OSCAL System Security Plan (SSP) Model: JSON Schema",
+ { "$schema" : "http://json-schema.org/draft-07/schema#",
+  "$id" : "http://csrc.nist.gov/ns/oscal/1.0.6/oscal-ssp-schema.json",
+  "$comment" : "OSCAL System Security Plan (SSP) Model: JSON Schema",
+  "type" : "object",
+  "definitions" : 
+  { "json-schema-directive" : 
+   { "title" : "Schema Directive",
+    "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
+    "$id" : "#json-schema-directive",
+    "$ref" : "#/definitions/URIReferenceDatatype" },
+   "oscal-ssp-oscal-ssp:system-security-plan" : 
+   { "title" : "System Security Plan (SSP)",
+    "description" : "A system security plan, such as those described in NIST SP 800-18.",
+    "$id" : "#assembly_oscal-ssp_system-security-plan",
     "type" : "object",
-    "definitions" : 
-    { "json-schema-directive" : 
-      { "title" : "Schema Directive",
-        "description" : "A JSON Schema directive to bind a specific schema to its document instance.",
-        "$id" : "#json-schema-directive",
-        "$ref" : "#/definitions/URIReferenceDatatype" },
-      "oscal-ssp-oscal-ssp:system-security-plan" : 
-      { "title" : "System Security Plan (SSP)",
-        "description" : "A system security plan, such as those described in NIST SP 800-18",
-        "$id" : "#assembly_oscal-ssp_system-security-plan",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "System Security Plan Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "metadata" : 
-          { "$ref" : "#assembly_oscal-metadata_metadata" },
-          "import-profile" : 
-          { "$ref" : "#assembly_oscal-ssp_import-profile" },
-          "system-characteristics" : 
-          { "$ref" : "#assembly_oscal-ssp_system-characteristics" },
-          "system-implementation" : 
-          { "$ref" : "#assembly_oscal-ssp_system-implementation" },
-          "control-implementation" : 
-          { "$ref" : "#assembly_oscal-ssp_control-implementation" },
-          "back-matter" : 
-          { "$ref" : "#assembly_oscal-metadata_back-matter" } },
-        "required" : 
-        [ "uuid",
-          "metadata",
-          "import-profile",
-          "system-characteristics",
-          "system-implementation",
-          "control-implementation" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:import-profile" : 
-      { "title" : "Import Profile",
-        "description" : "Used to import the OSCAL profile representing the system's control baseline.",
-        "$id" : "#assembly_oscal-ssp_import-profile",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Profile Reference",
-            "description" : "A resolvable URL reference to the profile or catalog to use as the system's control baseline.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:system-characteristics" : 
-      { "title" : "System Characteristics",
-        "description" : "Contains the characteristics of the system, such as its name, purpose, and security impact level.",
-        "$id" : "#assembly_oscal-ssp_system-characteristics",
-        "type" : "object",
-        "properties" : 
-        { "system-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_system-id" } },
-          "system-name" : 
-          { "title" : "System Name - Full",
-            "description" : "The full name of the system.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "system-name-short" : 
-          { "title" : "System Name - Short",
-            "description" : "A short name for the system, such as an acronym, that is suitable for display in a data table or summary list.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "System Description",
-            "description" : "A summary of the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "date-authorized" : 
-          { "$ref" : "#field_oscal-ssp_date-authorized" },
-          "security-sensitivity-level" : 
-          { "title" : "Security Sensitivity Level",
-            "description" : "The overall information system sensitivity categorization, such as defined by FIPS-199.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "system-information" : 
-          { "$ref" : "#assembly_oscal-ssp_system-information" },
-          "security-impact-level" : 
-          { "$ref" : "#assembly_oscal-ssp_security-impact-level" },
-          "status" : 
-          { "$ref" : "#assembly_oscal-ssp_status" },
-          "authorization-boundary" : 
-          { "$ref" : "#assembly_oscal-ssp_authorization-boundary" },
-          "network-architecture" : 
-          { "$ref" : "#assembly_oscal-ssp_network-architecture" },
-          "data-flow" : 
-          { "$ref" : "#assembly_oscal-ssp_data-flow" },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "system-ids",
-          "system-name",
-          "description",
-          "security-sensitivity-level",
-          "system-information",
-          "security-impact-level",
-          "status",
-          "authorization-boundary" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:system-information" : 
-      { "title" : "System Information",
-        "description" : "Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
-        "$id" : "#assembly_oscal-ssp_system-information",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "information-types" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Information Type",
-              "description" : "Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Information Type Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "title field",
-                  "description" : "A human readable name for the information type. This title should be meaningful within the context of the system.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Information Type Description",
-                  "description" : "A summary of how this information type is used within the system.",
-                  "type" : "string" },
-                "categorizations" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Information Type Categorization",
-                    "description" : "A set of information type identifiers qualified by the given identification system used, such as NIST SP 800-60.",
-                    "type" : "object",
-                    "properties" : 
-                    { "system" : 
-                      { "title" : "Information Type Identification System",
-                        "description" : "Specifies the information type identification system used.",
-                        "anyOf" : 
-                        [ 
-                          { "$ref" : "#/definitions/URIDatatype" },
-                          
-                          { "enum" : 
-                            [ "http://doi.org/10.6028/NIST.SP.800-60v2r1" ] } ] },
-                      "information-type-ids" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "title" : "Information Type Systematized Identifier",
-                          "description" : "A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                          "$ref" : "#/definitions/StringDatatype" } } },
-                    "required" : 
-                    [ "system" ],
-                    "additionalProperties" : false } },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "confidentiality-impact" : 
-                { "title" : "Confidentiality Impact Level",
-                  "description" : "The expected level of impact resulting from the unauthorized disclosure of the described information.",
-                  "type" : "object",
-                  "properties" : 
-                  { "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" : 
-                    { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" : 
-                    { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" : 
-                    { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" : 
-                  [ "base" ],
-                  "additionalProperties" : false },
-                "integrity-impact" : 
-                { "title" : "Integrity Impact Level",
-                  "description" : "The expected level of impact resulting from the unauthorized modification of the described information.",
-                  "type" : "object",
-                  "properties" : 
-                  { "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" : 
-                    { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" : 
-                    { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" : 
-                    { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" : 
-                  [ "base" ],
-                  "additionalProperties" : false },
-                "availability-impact" : 
-                { "title" : "Availability Impact Level",
-                  "description" : "The expected level of impact resulting from the disruption of access to or use of the described information or the information system.",
-                  "type" : "object",
-                  "properties" : 
-                  { "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "base" : 
-                    { "$ref" : "#field_oscal-ssp_base" },
-                    "selected" : 
-                    { "$ref" : "#field_oscal-ssp_selected" },
-                    "adjustment-justification" : 
-                    { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
-                  "required" : 
-                  [ "base" ],
-                  "additionalProperties" : false } },
-              "required" : 
-              [ "title",
-                "description",
-                "confidentiality-impact",
-                "integrity-impact",
-                "availability-impact" ],
-              "additionalProperties" : false } } },
-        "required" : 
-        [ "information-types" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:base" : 
-      { "title" : "Base Level (Confidentiality, Integrity, or Availability)",
-        "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.",
-        "$id" : "#field_oscal-ssp_base",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-ssp:selected" : 
-      { "title" : "Selected Level (Confidentiality, Integrity, or Availability)",
-        "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.",
-        "$id" : "#field_oscal-ssp_selected",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-ssp:adjustment-justification" : 
-      { "title" : "Adjustment Justification",
-        "description" : "If the selected security level is different from the base security level, this contains the justification for the change.",
-        "$id" : "#field_oscal-ssp_adjustment-justification",
-        "type" : "string" },
-      "oscal-ssp-oscal-ssp:security-impact-level" : 
-      { "title" : "Security Impact Level",
-        "description" : "The overall level of expected impact resulting from unauthorized disclosure, modification, or loss of access to information.",
-        "$id" : "#assembly_oscal-ssp_security-impact-level",
-        "type" : "object",
-        "properties" : 
-        { "security-objective-confidentiality" : 
-          { "title" : "Security Objective: Confidentiality",
-            "description" : "A target-level of confidentiality for the system, based on the sensitivity of information within the system.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "security-objective-integrity" : 
-          { "title" : "Security Objective: Integrity",
-            "description" : "A target-level of integrity for the system, based on the sensitivity of information within the system.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "security-objective-availability" : 
-          { "title" : "Security Objective: Availability",
-            "description" : "A target-level of availability for the system, based on the sensitivity of information within the system.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "security-objective-confidentiality",
-          "security-objective-integrity",
-          "security-objective-availability" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:status" : 
-      { "title" : "Status",
-        "description" : "Describes the operational status of the system.",
-        "$id" : "#assembly_oscal-ssp_status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "State",
-            "description" : "The current operating status.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "operational",
-                  "under-development",
-                  "under-major-modification",
-                  "disposition",
-                  "other" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:date-authorized" : 
-      { "title" : "System Authorization Date",
-        "description" : "The date the system received its authorization.",
-        "$id" : "#field_oscal-ssp_date-authorized",
-        "$ref" : "#/definitions/DateDatatype" },
-      "oscal-ssp-oscal-ssp:authorization-boundary" : 
-      { "title" : "Authorization Boundary",
-        "description" : "A description of this system's authorization boundary, optionally supplemented by diagrams that illustrate the authorization boundary.",
-        "$id" : "#assembly_oscal-ssp_authorization-boundary",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Authorization Boundary Description",
-            "description" : "A summary of the system's authorization boundary.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "description" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:diagram" : 
-      { "title" : "Diagram",
-        "description" : "A graphic that provides a visual representation the system, or some aspect of it.",
-        "$id" : "#assembly_oscal-ssp_diagram",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Diagram ID",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Diagram Description",
-            "description" : "A summary of the diagram.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "caption" : 
-          { "title" : "Caption",
-            "description" : "A brief caption to annotate the diagram.",
-            "type" : "string" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:network-architecture" : 
-      { "title" : "Network Architecture",
-        "description" : "A description of the system's network architecture, optionally supplemented by diagrams that illustrate the network architecture.",
-        "$id" : "#assembly_oscal-ssp_network-architecture",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Network Architecture Description",
-            "description" : "A summary of the system's network architecture.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "description" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:data-flow" : 
-      { "title" : "Data Flow",
-        "description" : "A description of the logical flow of information within the system and across its boundaries, optionally supplemented by diagrams that illustrate these flows.",
-        "$id" : "#assembly_oscal-ssp_data-flow",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Data Flow Description",
-            "description" : "A summary of the system's data flow.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "diagrams" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_diagram" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "description" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:system-implementation" : 
-      { "title" : "System Implementation",
-        "description" : "Provides information as to how the system is implemented.",
-        "$id" : "#assembly_oscal-ssp_system-implementation",
-        "type" : "object",
-        "properties" : 
-        { "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "leveraged-authorizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Leveraged Authorization",
-              "description" : "A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Leveraged Authorization Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "title field",
-                  "description" : "A human readable name for the leveraged authorization in the context of the system.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "party-uuid" : 
-                { "title" : "party-uuid field",
-                  "description" : "A machine-oriented identifier reference to the party that manages the leveraged system.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "date-authorized" : 
-                { "$ref" : "#field_oscal-ssp_date-authorized" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "title",
-                "party-uuid",
-                "date-authorized" ],
-              "additionalProperties" : false } },
-          "users" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
-          "components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
-          "inventory-items" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "users",
-          "components" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:control-implementation" : 
-      { "title" : "Control Implementation",
-        "description" : "Describes how the system satisfies a set of controls.",
-        "$id" : "#assembly_oscal-ssp_control-implementation",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "A statement describing important things to know about how this set of control satisfaction documentation is approached.",
-            "type" : "string" },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implemented-requirements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_implemented-requirement" } } },
-        "required" : 
-        [ "description",
-          "implemented-requirements" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:implemented-requirement" : 
-      { "title" : "Control-based Requirement",
-        "description" : "Describes how the system satisfies the requirements of an individual control.",
-        "$id" : "#assembly_oscal-ssp_implemented-requirement",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Control Requirement Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "control-id" : 
-          { "title" : "Control Identifier Reference",
-            "description" : "A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "statements" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_statement" } },
-          "by-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_by-component" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "control-id" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:statement" : 
-      { "title" : "Specific Control Statement",
-        "description" : "Identifies which statements within a control are addressed.",
-        "$id" : "#assembly_oscal-ssp_statement",
-        "type" : "object",
-        "properties" : 
-        { "statement-id" : 
-          { "title" : "Control Statement Reference",
-            "description" : "A human-oriented identifier reference to a control statement.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "uuid" : 
-          { "title" : "Control Statement Reference Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "by-components" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-ssp_by-component" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "statement-id",
-          "uuid" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-ssp:by-component" : 
-      { "title" : "Component Control Implementation",
-        "description" : "Defines how the referenced component implements a set of controls.",
-        "$id" : "#assembly_oscal-ssp_by-component",
-        "type" : "object",
-        "properties" : 
-        { "component-uuid" : 
-          { "title" : "Component Universally Unique Identifier Reference",
-            "description" : "A machine-oriented identifier reference to the component that is implemeting a given control.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "uuid" : 
-          { "title" : "By-Component Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "description" : 
-          { "title" : "Control Implementation Description",
-            "description" : "An implementation statement that describes how a control or a control statement is implemented within the referenced system component.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "set-parameters" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
-          "implementation-status" : 
-          { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
-          "export" : 
-          { "title" : "Export",
-            "description" : "Identifies content intended for external consumption, such as with leveraged organizations.",
-            "type" : "object",
-            "properties" : 
-            { "description" : 
-              { "title" : "Control Implementation Export Description",
-                "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be available to another system leveraging this system.",
-                "type" : "string" },
-              "props" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-metadata_property" } },
-              "links" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "$ref" : "#assembly_oscal-metadata_link" } },
-              "provided" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Provided Control Implementation",
-                  "description" : "Describes a capability which may be inherited by a leveraging system.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Provided Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "description" : 
-                    { "title" : "Provided Control Implementation Description",
-                      "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be provided to another system leveraging this system.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "responsible-roles" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "description" ],
-                  "additionalProperties" : false } },
-              "responsibilities" : 
-              { "type" : "array",
-                "minItems" : 1,
-                "items" : 
-                { "title" : "Control Implementation Responsibility",
-                  "description" : "Describes a control implementation responsibility imposed on a leveraging system.",
-                  "type" : "object",
-                  "properties" : 
-                  { "uuid" : 
-                    { "title" : "Responsibility Universally Unique Identifier",
-                      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "provided-uuid" : 
-                    { "title" : "Provided UUID",
-                      "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
-                      "$ref" : "#/definitions/UUIDDatatype" },
-                    "description" : 
-                    { "title" : "Control Implementation Responsibility Description",
-                      "description" : "An implementation statement that describes the aspects of the control or control statement implementation that a leveraging system must implement to satisfy the control provided by a leveraged system.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } },
-                    "responsible-roles" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                    "remarks" : 
-                    { "$ref" : "#field_oscal-metadata_remarks" } },
-                  "required" : 
-                  [ "uuid",
-                    "description" ],
-                  "additionalProperties" : false } },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "additionalProperties" : false },
-          "inherited" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Inherited Control Implementation",
-              "description" : "Describes a control implementation inherited by a leveraging system.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Inherited Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "provided-uuid" : 
-                { "title" : "Provided UUID",
-                  "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Inherited Control Implementation Description",
-                  "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is inheriting from a leveraged system.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "satisfied" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Satisfied Control Implementation Responsibility",
-              "description" : "Describes how this system satisfies a responsibility imposed by a leveraged system.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Satisfied Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "responsibility-uuid" : 
-                { "title" : "Responsibility UUID",
-                  "description" : "A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "description" : 
-                { "title" : "Satisfied Control Implementation Responsibility Description",
-                  "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is implementing based on a requirement from a leveraged system.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-roles" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid",
-                "description" ],
-              "additionalProperties" : false } },
-          "responsible-roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "component-uuid",
-          "uuid",
-          "description" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:metadata" : 
-      { "title" : "Publication metadata",
-        "description" : "Provides information about the publication and availability of the containing document.",
-        "$id" : "#assembly_oscal-metadata_metadata",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "revisions" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_revision" } },
-          "document-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_document-id" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "roles" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_role" } },
-          "locations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_location" } },
-          "parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_party" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "title",
-          "last-modified",
-          "version",
-          "oscal-version" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:revision" : 
-      { "title" : "Revision History Entry",
-        "description" : "An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).",
-        "$id" : "#assembly_oscal-metadata_revision",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Document Title",
-            "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "published" : 
-          { "$ref" : "#field_oscal-metadata_published" },
-          "last-modified" : 
-          { "$ref" : "#field_oscal-metadata_last-modified" },
-          "version" : 
-          { "$ref" : "#field_oscal-metadata_version" },
-          "oscal-version" : 
-          { "$ref" : "#field_oscal-metadata_oscal-version" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "version" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:location" : 
-      { "title" : "Location",
-        "description" : "A location, with associated metadata that can be referenced.",
-        "$id" : "#assembly_oscal-metadata_location",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Location Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "Location Title",
-            "description" : "A name given to the location, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "address" : 
-          { "$ref" : "#assembly_oscal-metadata_address" },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "urls" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Location URL",
-              "description" : "The uniform resource locator (URL) for a web site or Internet presence associated with the location.",
-              "$ref" : "#/definitions/URIDatatype" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "address" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:location-uuid" : 
-      { "title" : "Location Reference",
-        "description" : "A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_location-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-ssp-oscal-metadata:party" : 
-      { "title" : "Party (organization or person)",
-        "description" : "A responsible entity which is either a person or an organization.",
-        "$id" : "#assembly_oscal-metadata_party",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Party Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Party Type",
-            "description" : "A category describing the kind of party the object describes.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "person",
-                  "organization" ] } ] },
-          "name" : 
-          { "title" : "Party Name",
-            "description" : "The full name of the party. This is typically the legal name associated with the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "short-name" : 
-          { "title" : "Party Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the party.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "external-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Party External Identifier",
-              "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)",
-              "type" : "object",
-              "properties" : 
-              { "scheme" : 
-                { "title" : "External Identifier Schema",
-                  "description" : "Indicates the type of external identifier.",
-                  "anyOf" : 
-                  [ 
-                    { "$ref" : "#/definitions/URIDatatype" },
-                    
-                    { "enum" : 
-                      [ "http://orcid.org/" ] } ] },
-                "id" : 
-                { "$ref" : "#/definitions/StringDatatype" } },
-              "required" : 
-              [ "id",
-                "scheme" ],
-              "additionalProperties" : false } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "email-addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_email-address" } },
-          "telephone-numbers" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_telephone-number" } },
-          "addresses" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_address" } },
-          "location-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_location-uuid" } },
-          "member-of-organizations" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Organizational Affiliation",
-              "description" : "A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-              "$ref" : "#/definitions/UUIDDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:party-uuid" : 
-      { "title" : "Party Reference",
-        "description" : "A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
-        "$id" : "#field_oscal-metadata_party-uuid",
-        "$ref" : "#/definitions/UUIDDatatype" },
-      "oscal-ssp-oscal-metadata:role" : 
-      { "title" : "Role",
-        "description" : "Defines a function assumed or expected to be assumed by a party in a specific situation.",
-        "$id" : "#assembly_oscal-metadata_role",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Role Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Role Title",
-            "description" : "A name given to the role, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "Role Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the role.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "Role Description",
-            "description" : "A summary of the role's purpose and associated responsibilities.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id",
-          "title" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:role-id" : 
-      { "title" : "Role Identifier Reference",
-        "description" : "A human-oriented identifier reference to roles served by the user.",
-        "$id" : "#field_oscal-metadata_role-id",
-        "$ref" : "#/definitions/TokenDatatype" },
-      "oscal-ssp-oscal-metadata:back-matter" : 
-      { "title" : "Back matter",
-        "description" : "A collection of resources, which may be included directly or by reference.",
-        "$id" : "#assembly_oscal-metadata_back-matter",
-        "type" : "object",
-        "properties" : 
-        { "resources" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Resource",
-              "description" : "A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.",
-              "type" : "object",
-              "properties" : 
-              { "uuid" : 
-                { "title" : "Resource Universally Unique Identifier",
-                  "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "title" : 
-                { "title" : "Resource Title",
-                  "description" : "A name given to the resource, which may be used by a tool for display and navigation.",
-                  "type" : "string" },
-                "description" : 
-                { "title" : "Resource Description",
-                  "description" : "A short summary of the resource used to indicate the purpose of the resource.",
-                  "type" : "string" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "document-ids" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#field_oscal-metadata_document-id" } },
-                "citation" : 
-                { "title" : "Citation",
-                  "description" : "A citation consisting of end note text and optional structured bibliographic data.",
-                  "type" : "object",
-                  "properties" : 
-                  { "text" : 
-                    { "title" : "Citation Text",
-                      "description" : "A line of citation text.",
-                      "type" : "string" },
-                    "props" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_property" } },
-                    "links" : 
-                    { "type" : "array",
-                      "minItems" : 1,
-                      "items" : 
-                      { "$ref" : "#assembly_oscal-metadata_link" } } },
-                  "required" : 
-                  [ "text" ],
-                  "additionalProperties" : false },
-                "rlinks" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "title" : "Resource link",
-                    "description" : "A pointer to an external resource with an optional hash for verification and change detection.",
-                    "type" : "object",
-                    "properties" : 
-                    { "href" : 
-                      { "title" : "Hypertext Reference",
-                        "description" : "A resolvable URI reference to a resource.",
-                        "$ref" : "#/definitions/URIReferenceDatatype" },
-                      "media-type" : 
-                      { "title" : "Media Type",
-                        "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                        "$ref" : "#/definitions/StringDatatype" },
-                      "hashes" : 
-                      { "type" : "array",
-                        "minItems" : 1,
-                        "items" : 
-                        { "$ref" : "#field_oscal-metadata_hash" } } },
-                    "required" : 
-                    [ "href" ],
-                    "additionalProperties" : false } },
-                "base64" : 
-                { "title" : "Base64",
-                  "description" : "The Base64 alphabet in RFC 2045 - aligned with XSD.",
-                  "type" : "object",
-                  "properties" : 
-                  { "filename" : 
-                    { "title" : "File Name",
-                      "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
-                      "$ref" : "#/definitions/URIReferenceDatatype" },
-                    "media-type" : 
-                    { "title" : "Media Type",
-                      "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-                      "$ref" : "#/definitions/StringDatatype" },
-                    "value" : 
-                    { "$ref" : "#/definitions/Base64Datatype" } },
-                  "required" : 
-                  [ "value" ],
-                  "additionalProperties" : false },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "uuid" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:property" : 
-      { "title" : "Property",
-        "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.",
-        "$id" : "#assembly_oscal-metadata_property",
-        "type" : "object",
-        "properties" : 
-        { "name" : 
-          { "title" : "Property Name",
-            "description" : "A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "marking" ] } ] },
-          "uuid" : 
-          { "title" : "Property Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "ns" : 
-          { "title" : "Property Namespace",
-            "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "value" : 
-          { "title" : "Property Value",
-            "description" : "Indicates the value of the attribute, characteristic, or quality.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "class" : 
-          { "title" : "Property Class",
-            "description" : "A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "name",
-          "value" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:link" : 
-      { "title" : "Link",
-        "description" : "A reference to a local or remote resource",
-        "$id" : "#assembly_oscal-metadata_link",
-        "type" : "object",
-        "properties" : 
-        { "href" : 
-          { "title" : "Hypertext Reference",
-            "description" : "A resolvable URL reference to a resource.",
-            "$ref" : "#/definitions/URIReferenceDatatype" },
-          "rel" : 
-          { "title" : "Relation",
-            "description" : "Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "reference" ] } ] },
-          "media-type" : 
-          { "title" : "Media Type",
-            "description" : "Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "text" : 
-          { "title" : "Link Text",
-            "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
-            "type" : "string" } },
-        "required" : 
-        [ "href" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:responsible-party" : 
-      { "title" : "Responsible Party",
-        "description" : "A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-party",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role",
-            "description" : "A human-oriented identifier reference to roles served by the user.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id",
-          "party-uuids" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:responsible-role" : 
-      { "title" : "Responsible Role",
-        "description" : "A reference to one or more roles with responsibility for performing a function relative to the containing object.",
-        "$id" : "#assembly_oscal-metadata_responsible-role",
-        "type" : "object",
-        "properties" : 
-        { "role-id" : 
-          { "title" : "Responsible Role ID",
-            "description" : "A human-oriented identifier reference to roles responsible for the business function.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "party-uuids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_party-uuid" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "role-id" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:hash" : 
-      { "title" : "Hash",
-        "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
-        "$id" : "#field_oscal-metadata_hash",
-        "type" : "object",
-        "properties" : 
-        { "algorithm" : 
-          { "title" : "Hash algorithm",
-            "description" : "Method by which a hash is derived",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "System Security Plan Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "metadata" : 
+     { "$ref" : "#assembly_oscal-metadata_metadata" },
+     "import-profile" : 
+     { "$ref" : "#assembly_oscal-ssp_import-profile" },
+     "system-characteristics" : 
+     { "$ref" : "#assembly_oscal-ssp_system-characteristics" },
+     "system-implementation" : 
+     { "$ref" : "#assembly_oscal-ssp_system-implementation" },
+     "control-implementation" : 
+     { "$ref" : "#assembly_oscal-ssp_control-implementation" },
+     "back-matter" : 
+     { "$ref" : "#assembly_oscal-metadata_back-matter" } },
+    "required" : 
+    [ "uuid",
+     "metadata",
+     "import-profile",
+     "system-characteristics",
+     "system-implementation",
+     "control-implementation" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:import-profile" : 
+   { "title" : "Import Profile",
+    "description" : "Used to import the OSCAL profile representing the system's control baseline.",
+    "$id" : "#assembly_oscal-ssp_import-profile",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Profile Reference",
+      "description" : "A resolvable URL reference to the profile or catalog to use as the system's control baseline.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:system-characteristics" : 
+   { "title" : "System Characteristics",
+    "description" : "Contains the characteristics of the system, such as its name, purpose, and security impact level.",
+    "$id" : "#assembly_oscal-ssp_system-characteristics",
+    "type" : "object",
+    "properties" : 
+    { "system-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_system-id" } },
+     "system-name" : 
+     { "title" : "System Name - Full",
+      "description" : "The full name of the system.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "system-name-short" : 
+     { "title" : "System Name - Short",
+      "description" : "A short name for the system, such as an acronym, that is suitable for display in a data table or summary list.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "System Description",
+      "description" : "A summary of the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "date-authorized" : 
+     { "$ref" : "#field_oscal-ssp_date-authorized" },
+     "security-sensitivity-level" : 
+     { "title" : "Security Sensitivity Level",
+      "description" : "The overall information system sensitivity categorization, such as defined by FIPS-199.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "system-information" : 
+     { "$ref" : "#assembly_oscal-ssp_system-information" },
+     "security-impact-level" : 
+     { "$ref" : "#assembly_oscal-ssp_security-impact-level" },
+     "status" : 
+     { "$ref" : "#assembly_oscal-ssp_status" },
+     "authorization-boundary" : 
+     { "$ref" : "#assembly_oscal-ssp_authorization-boundary" },
+     "network-architecture" : 
+     { "$ref" : "#assembly_oscal-ssp_network-architecture" },
+     "data-flow" : 
+     { "$ref" : "#assembly_oscal-ssp_data-flow" },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "system-ids",
+     "system-name",
+     "description",
+     "security-sensitivity-level",
+     "system-information",
+     "security-impact-level",
+     "status",
+     "authorization-boundary" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:system-information" : 
+   { "title" : "System Information",
+    "description" : "Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
+    "$id" : "#assembly_oscal-ssp_system-information",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "information-types" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Information Type",
+       "description" : "Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Information Type Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "title field",
+         "description" : "A human readable name for the information type. This title should be meaningful within the context of the system.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Information Type Description",
+         "description" : "A summary of how this information type is used within the system.",
+         "type" : "string" },
+        "categorizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Information Type Categorization",
+          "description" : "A set of information type identifiers qualified by the given identification system used, such as NIST SP 800-60.",
+          "type" : "object",
+          "properties" : 
+          { "system" : 
+           { "title" : "Information Type Identification System",
+            "description" : "Specifies the information type identification system used.",
             "anyOf" : 
             [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "SHA-224",
-                  "SHA-256",
-                  "SHA-384",
-                  "SHA-512",
-                  "SHA3-224",
-                  "SHA3-256",
-                  "SHA3-384",
-                  "SHA3-512" ] } ] },
-          "value" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "value",
-          "algorithm" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:remarks" : 
-      { "title" : "Remarks",
-        "description" : "Additional commentary on the containing object.",
-        "$id" : "#field_oscal-metadata_remarks",
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://doi.org/10.6028/NIST.SP.800-60v2r1" ] } ] },
+           "information-type-ids" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "title" : "Information Type Systematized Identifier",
+             "description" : "A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+             "$ref" : "#/definitions/StringDatatype" } } },
+          "required" : 
+          [ "system" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "confidentiality-impact" : 
+        { "$ref" : "#assembly_oscal-ssp_impact" },
+        "integrity-impact" : 
+        { "$ref" : "#assembly_oscal-ssp_impact" },
+        "availability-impact" : 
+        { "$ref" : "#assembly_oscal-ssp_impact" } },
+       "required" : 
+       [ "title",
+        "description" ],
+       "additionalProperties" : false } } },
+    "required" : 
+    [ "information-types" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:impact" : 
+   { "title" : "Impact Level",
+    "description" : "The expected level of impact resulting from the described information.",
+    "$id" : "#assembly_oscal-ssp_impact",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "base" : 
+     { "$ref" : "#field_oscal-ssp_base" },
+     "selected" : 
+     { "$ref" : "#field_oscal-ssp_selected" },
+     "adjustment-justification" : 
+     { "$ref" : "#field_oscal-ssp_adjustment-justification" } },
+    "required" : 
+    [ "base" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:base" : 
+   { "title" : "Base Level (Confidentiality, Integrity, or Availability)",
+    "description" : "The prescribed base (Confidentiality, Integrity, or Availability) security impact level.",
+    "$id" : "#field_oscal-ssp_base",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-ssp:selected" : 
+   { "title" : "Selected Level (Confidentiality, Integrity, or Availability)",
+    "description" : "The selected (Confidentiality, Integrity, or Availability) security impact level.",
+    "$id" : "#field_oscal-ssp_selected",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-ssp:adjustment-justification" : 
+   { "title" : "Adjustment Justification",
+    "description" : "If the selected security level is different from the base security level, this contains the justification for the change.",
+    "$id" : "#field_oscal-ssp_adjustment-justification",
+    "type" : "string" },
+   "oscal-ssp-oscal-ssp:security-impact-level" : 
+   { "title" : "Security Impact Level",
+    "description" : "The overall level of expected impact resulting from unauthorized disclosure, modification, or loss of access to information.",
+    "$id" : "#assembly_oscal-ssp_security-impact-level",
+    "type" : "object",
+    "properties" : 
+    { "security-objective-confidentiality" : 
+     { "title" : "Security Objective: Confidentiality",
+      "description" : "A target-level of confidentiality for the system, based on the sensitivity of information within the system.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "security-objective-integrity" : 
+     { "title" : "Security Objective: Integrity",
+      "description" : "A target-level of integrity for the system, based on the sensitivity of information within the system.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "security-objective-availability" : 
+     { "title" : "Security Objective: Availability",
+      "description" : "A target-level of availability for the system, based on the sensitivity of information within the system.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "security-objective-confidentiality",
+     "security-objective-integrity",
+     "security-objective-availability" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:status" : 
+   { "title" : "Status",
+    "description" : "Describes the operational status of the system.",
+    "$id" : "#assembly_oscal-ssp_status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "State",
+      "description" : "The current operating status.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "operational",
+         "under-development",
+         "under-major-modification",
+         "disposition",
+         "other" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:date-authorized" : 
+   { "title" : "System Authorization Date",
+    "description" : "The date the system received its authorization.",
+    "$id" : "#field_oscal-ssp_date-authorized",
+    "$ref" : "#/definitions/DateDatatype" },
+   "oscal-ssp-oscal-ssp:authorization-boundary" : 
+   { "title" : "Authorization Boundary",
+    "description" : "A description of this system's authorization boundary, optionally supplemented by diagrams that illustrate the authorization boundary.",
+    "$id" : "#assembly_oscal-ssp_authorization-boundary",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Authorization Boundary Description",
+      "description" : "A summary of the system's authorization boundary.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "diagrams" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_diagram" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "description" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:diagram" : 
+   { "title" : "Diagram",
+    "description" : "A graphic that provides a visual representation the system, or some aspect of it.",
+    "$id" : "#assembly_oscal-ssp_diagram",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Diagram ID",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Diagram Description",
+      "description" : "A summary of the diagram.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "caption" : 
+     { "title" : "Caption",
+      "description" : "A brief caption to annotate the diagram.",
+      "type" : "string" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:network-architecture" : 
+   { "title" : "Network Architecture",
+    "description" : "A description of the system's network architecture, optionally supplemented by diagrams that illustrate the network architecture.",
+    "$id" : "#assembly_oscal-ssp_network-architecture",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Network Architecture Description",
+      "description" : "A summary of the system's network architecture.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "diagrams" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_diagram" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "description" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:data-flow" : 
+   { "title" : "Data Flow",
+    "description" : "A description of the logical flow of information within the system and across its boundaries, optionally supplemented by diagrams that illustrate these flows.",
+    "$id" : "#assembly_oscal-ssp_data-flow",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Data Flow Description",
+      "description" : "A summary of the system's data flow.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "diagrams" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_diagram" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "description" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:system-implementation" : 
+   { "title" : "System Implementation",
+    "description" : "Provides information as to how the system is implemented.",
+    "$id" : "#assembly_oscal-ssp_system-implementation",
+    "type" : "object",
+    "properties" : 
+    { "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "leveraged-authorizations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Leveraged Authorization",
+       "description" : "A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Leveraged Authorization Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "title field",
+         "description" : "A human readable name for the leveraged authorization in the context of the system.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "party-uuid" : 
+        { "title" : "party-uuid field",
+         "description" : "A machine-oriented identifier reference to the party that manages the leveraged system.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "date-authorized" : 
+        { "$ref" : "#field_oscal-ssp_date-authorized" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "title",
+        "party-uuid",
+        "date-authorized" ],
+       "additionalProperties" : false } },
+     "users" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-user" } },
+     "components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_system-component" } },
+     "inventory-items" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_inventory-item" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "users",
+     "components" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:control-implementation" : 
+   { "title" : "Control Implementation",
+    "description" : "Describes how the system satisfies a set of controls.",
+    "$id" : "#assembly_oscal-ssp_control-implementation",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "A statement describing important things to know about how this set of control satisfaction documentation is approached.",
+      "type" : "string" },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "implemented-requirements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_implemented-requirement" } } },
+    "required" : 
+    [ "description",
+     "implemented-requirements" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:implemented-requirement" : 
+   { "title" : "Control-based Requirement",
+    "description" : "Describes how the system satisfies the requirements of an individual control.",
+    "$id" : "#assembly_oscal-ssp_implemented-requirement",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Control Requirement Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "control-id" : 
+     { "title" : "Control Identifier Reference",
+      "description" : "A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "statements" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_statement" } },
+     "by-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_by-component" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "control-id" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:statement" : 
+   { "title" : "Specific Control Statement",
+    "description" : "Identifies which statements within a control are addressed.",
+    "$id" : "#assembly_oscal-ssp_statement",
+    "type" : "object",
+    "properties" : 
+    { "statement-id" : 
+     { "title" : "Control Statement Reference",
+      "description" : "A human-oriented identifier reference to a control statement.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Control Statement Reference Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "by-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-ssp_by-component" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "statement-id",
+     "uuid" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-ssp:by-component" : 
+   { "title" : "Component Control Implementation",
+    "description" : "Defines how the referenced component implements a set of controls.",
+    "$id" : "#assembly_oscal-ssp_by-component",
+    "type" : "object",
+    "properties" : 
+    { "component-uuid" : 
+     { "title" : "Component Universally Unique Identifier Reference",
+      "description" : "A machine-oriented identifier reference to the component that is implemeting a given control.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "uuid" : 
+     { "title" : "By-Component Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Control Implementation Description",
+      "description" : "An implementation statement that describes how a control or a control statement is implemented within the referenced system component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "set-parameters" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_set-parameter" } },
+     "implementation-status" : 
+     { "$ref" : "#assembly_oscal-implementation-common_implementation-status" },
+     "export" : 
+     { "title" : "Export",
+      "description" : "Identifies content intended for external consumption, such as with leveraged organizations.",
+      "type" : "object",
+      "properties" : 
+      { "description" : 
+       { "title" : "Control Implementation Export Description",
+        "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be available to another system leveraging this system.",
         "type" : "string" },
-      "oscal-ssp-oscal-metadata:published" : 
-      { "title" : "Publication Timestamp",
-        "description" : "The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_published",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-ssp-oscal-metadata:last-modified" : 
-      { "title" : "Last Modified Timestamp",
-        "description" : "The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.",
-        "$id" : "#field_oscal-metadata_last-modified",
-        "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
-      "oscal-ssp-oscal-metadata:version" : 
-      { "title" : "Document Version",
-        "description" : "A string used to distinguish the current version of the document from other previous (and future) versions.",
-        "$id" : "#field_oscal-metadata_version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-metadata:oscal-version" : 
-      { "title" : "OSCAL version",
-        "description" : "The OSCAL model version the document was authored against.",
-        "$id" : "#field_oscal-metadata_oscal-version",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-metadata:email-address" : 
-      { "title" : "Email Address",
-        "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
-        "$id" : "#field_oscal-metadata_email-address",
-        "$ref" : "#/definitions/EmailAddressDatatype" },
-      "oscal-ssp-oscal-metadata:telephone-number" : 
-      { "title" : "Telephone Number",
-        "description" : "Contact number by telephone.",
-        "$id" : "#field_oscal-metadata_telephone-number",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "type flag",
-            "description" : "Indicates the type of phone number.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "office",
-                  "mobile" ] } ] },
-          "number" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "number" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:address" : 
-      { "title" : "Address",
-        "description" : "A postal address for the location.",
-        "$id" : "#assembly_oscal-metadata_address",
-        "type" : "object",
-        "properties" : 
-        { "type" : 
-          { "title" : "Address Type",
-            "description" : "Indicates the type of address.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "home",
-                  "work" ] } ] },
-          "addr-lines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_addr-line" } },
-          "city" : 
-          { "title" : "City",
-            "description" : "City, town or geographical region for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "state" : 
-          { "title" : "State",
-            "description" : "State, province or analogous geographical region for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "postal-code" : 
-          { "title" : "Postal Code",
-            "description" : "Postal or ZIP code for mailing address",
-            "$ref" : "#/definitions/StringDatatype" },
-          "country" : 
-          { "title" : "Country Code",
-            "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
-            "$ref" : "#/definitions/StringDatatype" } },
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-metadata:addr-line" : 
-      { "title" : "Address line",
-        "description" : "A single line of an address.",
-        "$id" : "#field_oscal-metadata_addr-line",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-metadata:document-id" : 
-      { "title" : "Document Identifier",
-        "description" : "A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of \"document-id\" is equal to the value of the \"uuid\" flag of the top-level root element.",
-        "$id" : "#field_oscal-metadata_document-id",
-        "type" : "object",
-        "properties" : 
-        { "scheme" : 
-          { "title" : "Document Identification Scheme",
-            "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "http://www.doi.org/" ] } ] },
-          "identifier" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "identifier" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:system-component" : 
-      { "title" : "Component",
-        "description" : "A defined component that can be part of an implemented system.",
-        "$id" : "#assembly_oscal-implementation-common_system-component",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Component Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "type" : 
-          { "title" : "Component Type",
-            "description" : "A category describing the purpose of the component.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/StringDatatype" },
-              
-              { "enum" : 
-                [ "this-system",
-                  "system",
-                  "interconnection",
-                  "software",
-                  "hardware",
-                  "service",
-                  "policy",
-                  "physical",
-                  "process-procedure",
-                  "plan",
-                  "guidance",
-                  "standard",
-                  "validation",
-                  "network" ] } ] },
-          "title" : 
-          { "title" : "Component Title",
-            "description" : "A human readable name for the system component.",
-            "type" : "string" },
+       "props" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-metadata_property" } },
+       "links" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "$ref" : "#assembly_oscal-metadata_link" } },
+       "provided" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Provided Control Implementation",
+         "description" : "Describes a capability which may be inherited by a leveraging system.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Provided Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "description" : 
-          { "title" : "Component Description",
-            "description" : "A description of the component, including information about its function.",
-            "type" : "string" },
-          "purpose" : 
-          { "title" : "Purpose",
-            "description" : "A summary of the technological or business purpose of the component.",
-            "type" : "string" },
+          { "title" : "Provided Control Implementation Description",
+           "description" : "An implementation statement that describes the aspects of the control or control statement implementation that can be provided to another system leveraging this system.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "status" : 
-          { "title" : "Status",
-            "description" : "Describes the operational status of the system component.",
-            "type" : "object",
-            "properties" : 
-            { "state" : 
-              { "title" : "State",
-                "description" : "The operational status.",
-                "allOf" : 
-                [ 
-                  { "$ref" : "#/definitions/TokenDatatype" },
-                  
-                  { "enum" : 
-                    [ "under-development",
-                      "operational",
-                      "disposition",
-                      "other" ] } ] },
-              "remarks" : 
-              { "$ref" : "#field_oscal-metadata_remarks" } },
-            "required" : 
-            [ "state" ],
-            "additionalProperties" : false },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
           "responsible-roles" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
-          "protocols" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
-          "type",
-          "title",
-          "description",
-          "status" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:protocol" : 
-      { "title" : "Service Protocol Information",
-        "description" : "Information about the protocol used to provide a service.",
-        "$id" : "#assembly_oscal-implementation-common_protocol",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Service Protocol Information Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "name" : 
-          { "title" : "Protocol Name",
-            "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "title" : 
-          { "title" : "Protocol Title",
-            "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
-            "type" : "string" },
-          "port-ranges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:port-range" : 
-      { "title" : "Port Range",
-        "description" : "Where applicable this is the IPv4 port range on which the service operates.",
-        "$id" : "#assembly_oscal-implementation-common_port-range",
-        "type" : "object",
-        "properties" : 
-        { "start" : 
-          { "title" : "Start",
-            "description" : "Indicates the starting port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "end" : 
-          { "title" : "End",
-            "description" : "Indicates the ending port number in a port range",
-            "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
-          "transport" : 
-          { "title" : "Transport",
-            "description" : "Indicates the transport type.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "TCP",
-                  "UDP" ] } ] } },
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:implementation-status" : 
-      { "title" : "Implementation Status",
-        "description" : "Indicates the degree to which the a given control is implemented.",
-        "$id" : "#assembly_oscal-implementation-common_implementation-status",
-        "type" : "object",
-        "properties" : 
-        { "state" : 
-          { "title" : "Implementation State",
-            "description" : "Identifies the implementation status of the control or control objective.",
-            "anyOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "implemented",
-                  "partial",
-                  "planned",
-                  "alternative",
-                  "not-applicable" ] } ] },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "state" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:system-user" : 
-      { "title" : "System User",
-        "description" : "A type of user that interacts with the system based on an associated role.",
-        "$id" : "#assembly_oscal-implementation-common_system-user",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "User Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
-          "title" : 
-          { "title" : "User Title",
-            "description" : "A name given to the user, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "short-name" : 
-          { "title" : "User Short Name",
-            "description" : "A short common name, abbreviation, or acronym for the user.",
-            "$ref" : "#/definitions/StringDatatype" },
-          "description" : 
-          { "title" : "User Description",
-            "description" : "A summary of the user's purpose within the system.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "role-ids" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-metadata_role-id" } },
-          "authorized-privileges" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:authorized-privilege" : 
-      { "title" : "Privilege",
-        "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
-        "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
-        "type" : "object",
-        "properties" : 
-        { "title" : 
-          { "title" : "Privilege Title",
-            "description" : "A human readable name for the privilege.",
-            "type" : "string" },
-          "description" : 
-          { "title" : "Privilege Description",
-            "description" : "A summary of the privilege's purpose within the system.",
-            "type" : "string" },
-          "functions-performed" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
-        "required" : 
-        [ "title",
-          "functions-performed" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:function-performed" : 
-      { "title" : "Functions Performed",
-        "description" : "Describes a function performed for a given authorized privilege by this user class.",
-        "$id" : "#field_oscal-implementation-common_function-performed",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-implementation-common:inventory-item" : 
-      { "title" : "Inventory Item",
-        "description" : "A single managed inventory item within the system.",
-        "$id" : "#assembly_oscal-implementation-common_inventory-item",
-        "type" : "object",
-        "properties" : 
-        { "uuid" : 
-          { "title" : "Inventory Item Universally Unique Identifier",
-            "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/UUIDDatatype" },
+         "required" : 
+         [ "uuid",
+          "description" ],
+         "additionalProperties" : false } },
+       "responsibilities" : 
+       { "type" : "array",
+        "minItems" : 1,
+        "items" : 
+        { "title" : "Control Implementation Responsibility",
+         "description" : "Describes a control implementation responsibility imposed on a leveraging system.",
+         "type" : "object",
+         "properties" : 
+         { "uuid" : 
+          { "title" : "Responsibility Universally Unique Identifier",
+           "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+           "$ref" : "#/definitions/UUIDDatatype" },
+          "provided-uuid" : 
+          { "title" : "Provided UUID",
+           "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
+           "$ref" : "#/definitions/UUIDDatatype" },
           "description" : 
-          { "title" : "Inventory Item Description",
-            "description" : "A summary of the inventory item stating its purpose within the system.",
-            "type" : "string" },
+          { "title" : "Control Implementation Responsibility Description",
+           "description" : "An implementation statement that describes the aspects of the control or control statement implementation that a leveraging system must implement to satisfy the control provided by a leveraged system.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "responsible-parties" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-          "implemented-components" : 
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } },
+          "responsible-roles" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Implemented Component",
-              "description" : "The set of components that are implemented in a given system inventory item.",
-              "type" : "object",
-              "properties" : 
-              { "component-uuid" : 
-                { "title" : "Component Universally Unique Identifier Reference",
-                  "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
-                  "$ref" : "#/definitions/UUIDDatatype" },
-                "props" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_property" } },
-                "links" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_link" } },
-                "responsible-parties" : 
-                { "type" : "array",
-                  "minItems" : 1,
-                  "items" : 
-                  { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "component-uuid" ],
-              "additionalProperties" : false } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
           "remarks" : 
           { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "uuid",
+         "required" : 
+         [ "uuid",
           "description" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:set-parameter" : 
-      { "title" : "Set Parameter Value",
-        "description" : "Identifies the parameter that will be set by the enclosed value.",
-        "$id" : "#assembly_oscal-implementation-common_set-parameter",
-        "type" : "object",
-        "properties" : 
-        { "param-id" : 
-          { "title" : "Parameter ID",
-            "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Parameter Value",
-              "description" : "A parameter value or set of values.",
-              "$ref" : "#/definitions/StringDatatype" } },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "param-id",
-          "values" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-implementation-common:system-id" : 
-      { "title" : "System Identification",
-        "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
-        "$id" : "#field_oscal-implementation-common_system-id",
-        "type" : "object",
-        "properties" : 
-        { "identifier-type" : 
-          { "title" : "Identification System Type",
-            "description" : "Identifies the identification system from which the provided identifier was assigned.",
+         "additionalProperties" : false } },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "additionalProperties" : false },
+     "inherited" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Inherited Control Implementation",
+       "description" : "Describes a control implementation inherited by a leveraging system.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Inherited Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "provided-uuid" : 
+        { "title" : "Provided UUID",
+         "description" : "A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Inherited Control Implementation Description",
+         "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is inheriting from a leveraged system.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "satisfied" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Satisfied Control Implementation Responsibility",
+       "description" : "Describes how this system satisfies a responsibility imposed by a leveraged system.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Satisfied Universally Unique Identifier",
+         "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "responsibility-uuid" : 
+        { "title" : "Responsibility UUID",
+         "description" : "A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "description" : 
+        { "title" : "Satisfied Control Implementation Responsibility Description",
+         "description" : "An implementation statement that describes the aspects of a control or control statement implementation that a leveraging system is implementing based on a requirement from a leveraged system.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-roles" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "description" ],
+       "additionalProperties" : false } },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "component-uuid",
+     "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:metadata" : 
+   { "title" : "Document Metadata",
+    "description" : "Provides information about the containing document, and defines concepts that are shared across the document.",
+    "$id" : "#assembly_oscal-metadata_metadata",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Document Title",
+      "description" : "A name given to the document, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "published" : 
+     { "$ref" : "#field_oscal-metadata_published" },
+     "last-modified" : 
+     { "$ref" : "#field_oscal-metadata_last-modified" },
+     "version" : 
+     { "$ref" : "#field_oscal-metadata_version" },
+     "oscal-version" : 
+     { "$ref" : "#field_oscal-metadata_oscal-version" },
+     "revisions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Revision History Entry",
+       "description" : "An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).",
+       "type" : "object",
+       "properties" : 
+       { "title" : 
+        { "title" : "Document Title",
+         "description" : "A name given to the document revision, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "published" : 
+        { "$ref" : "#field_oscal-metadata_published" },
+        "last-modified" : 
+        { "$ref" : "#field_oscal-metadata_last-modified" },
+        "version" : 
+        { "$ref" : "#field_oscal-metadata_version" },
+        "oscal-version" : 
+        { "$ref" : "#field_oscal-metadata_oscal-version" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "version" ],
+       "additionalProperties" : false } },
+     "document-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_document-id" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Role",
+       "description" : "Defines a function, which might be assigned to a party in a specific situation.",
+       "type" : "object",
+       "properties" : 
+       { "id" : 
+        { "title" : "Role Identifier",
+         "description" : "A unique identifier for the role.",
+         "$ref" : "#/definitions/TokenDatatype" },
+        "title" : 
+        { "title" : "Role Title",
+         "description" : "A name given to the role, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "short-name" : 
+        { "title" : "Role Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the role.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "description" : 
+        { "title" : "Role Description",
+         "description" : "A summary of the role's purpose and associated responsibilities.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "id",
+        "title" ],
+       "additionalProperties" : false } },
+     "locations" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Location",
+       "description" : "A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Location Universally Unique Identifier",
+         "description" : "A unique ID for the location, for reference.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Location Title",
+         "description" : "A name given to the location, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "address" : 
+        { "$ref" : "#assembly_oscal-metadata_address" },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "urls" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Location URL",
+          "description" : "The uniform resource locator (URL) for a web site or other resource associated with the location.",
+          "$ref" : "#/definitions/URIDatatype" } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } },
+     "parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Party",
+       "description" : "An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Party Universally Unique Identifier",
+         "description" : "A unique identifier for the party.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "type" : 
+        { "title" : "Party Type",
+         "description" : "A category describing the kind of party the object describes.",
+         "allOf" : 
+         [ 
+          { "$ref" : "#/definitions/StringDatatype" },
+          
+          { "enum" : 
+           [ "person",
+            "organization" ] } ] },
+        "name" : 
+        { "title" : "Party Name",
+         "description" : "The full name of the party. This is typically the legal name associated with the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "short-name" : 
+        { "title" : "Party Short Name",
+         "description" : "A short common name, abbreviation, or acronym for the party.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "external-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Party External Identifier",
+          "description" : "An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).",
+          "type" : "object",
+          "properties" : 
+          { "scheme" : 
+           { "title" : "External Identifier Schema",
+            "description" : "Indicates the type of external identifier.",
             "anyOf" : 
             [ 
-              { "$ref" : "#/definitions/URIDatatype" },
-              
-              { "enum" : 
-                [ "https://fedramp.gov",
-                  "http://fedramp.gov/ns/oscal",
-                  "https://ietf.org/rfc/rfc4122",
-                  "http://ietf.org/rfc/rfc4122" ] } ] },
-          "id" : 
-          { "$ref" : "#/definitions/StringDatatype" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-catalog-common:part" : 
-      { "title" : "Part",
-        "description" : "A partition of a control's definition or a child of another part.",
-        "$id" : "#assembly_oscal-catalog-common_part",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Part Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "name" : 
-          { "title" : "Part Name",
-            "description" : "A textual label that uniquely identifies the part's semantic type.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "ns" : 
-          { "title" : "Part Namespace",
-            "description" : "A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
-            "$ref" : "#/definitions/URIDatatype" },
-          "class" : 
-          { "title" : "Part Class",
-            "description" : "A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "title" : 
-          { "title" : "Part Title",
-            "description" : "A name given to the part, which may be used by a tool for display and navigation.",
-            "type" : "string" },
-          "props" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
-          "prose" : 
-          { "title" : "Part Text",
-            "description" : "Permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" },
-          "parts" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_part" } },
-          "links" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } } },
-        "required" : 
-        [ "name" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-catalog-common:parameter" : 
-      { "title" : "Parameter",
-        "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
-        "$id" : "#assembly_oscal-catalog-common_parameter",
-        "type" : "object",
-        "properties" : 
-        { "id" : 
-          { "title" : "Parameter Identifier",
-            "description" : "A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "class" : 
-          { "title" : "Parameter Class",
-            "description" : "A textual label that provides a characterization of the parameter.",
-            "$ref" : "#/definitions/TokenDatatype" },
-          "depends-on" : 
-          { "title" : "Depends on",
-            "description" : "**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.",
-            "$ref" : "#/definitions/TokenDatatype" },
+             { "$ref" : "#/definitions/URIDatatype" },
+             
+             { "enum" : 
+              [ "http://orcid.org/" ] } ] },
+           "id" : 
+           { "$ref" : "#/definitions/StringDatatype" } },
+          "required" : 
+          [ "id",
+           "scheme" ],
+          "additionalProperties" : false } },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "email-addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_email-address" } },
+        "telephone-numbers" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_telephone-number" } },
+        "addresses" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_address" } },
+        "location-uuids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_location-uuid" } },
+        "member-of-organizations" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Organizational Affiliation",
+          "description" : "A reference to another party by UUID, typically an organization, that this subject is associated with.",
+          "$ref" : "#/definitions/UUIDDatatype" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid",
+        "type" ],
+       "additionalProperties" : false } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "actions" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_action" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "title",
+     "last-modified",
+     "version",
+     "oscal-version" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:location-uuid" : 
+   { "title" : "Location Universally Unique Identifier Reference",
+    "description" : "Reference to a location by UUID.",
+    "$id" : "#field_oscal-metadata_location-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-ssp-oscal-metadata:party-uuid" : 
+   { "title" : "Party Universally Unique Identifier Reference",
+    "description" : "Reference to a party by UUID.",
+    "$id" : "#field_oscal-metadata_party-uuid",
+    "$ref" : "#/definitions/UUIDDatatype" },
+   "oscal-ssp-oscal-metadata:role-id" : 
+   { "title" : "Role Identifier Reference",
+    "description" : "Reference to a role by UUID.",
+    "$id" : "#field_oscal-metadata_role-id",
+    "$ref" : "#/definitions/TokenDatatype" },
+   "oscal-ssp-oscal-metadata:back-matter" : 
+   { "title" : "Back matter",
+    "description" : "A collection of resources that may be referenced from within the OSCAL document instance.",
+    "$id" : "#assembly_oscal-metadata_back-matter",
+    "type" : "object",
+    "properties" : 
+    { "resources" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Resource",
+       "description" : "A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.",
+       "type" : "object",
+       "properties" : 
+       { "uuid" : 
+        { "title" : "Resource Universally Unique Identifier",
+         "description" : "A unique identifier for a resource.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "title" : 
+        { "title" : "Resource Title",
+         "description" : "An optional name given to the resource, which may be used by a tool for display and navigation.",
+         "type" : "string" },
+        "description" : 
+        { "title" : "Resource Description",
+         "description" : "An optional short summary of the resource used to indicate the purpose of the resource.",
+         "type" : "string" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "document-ids" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#field_oscal-metadata_document-id" } },
+        "citation" : 
+        { "title" : "Citation",
+         "description" : "An optional citation consisting of end note text using structured markup.",
+         "type" : "object",
+         "properties" : 
+         { "text" : 
+          { "title" : "Citation Text",
+           "description" : "A line of citation text.",
+           "type" : "string" },
           "props" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_property" } },
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_property" } },
           "links" : 
           { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-metadata_link" } },
-          "label" : 
-          { "title" : "Parameter Label",
-            "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
-            "type" : "string" },
-          "usage" : 
-          { "title" : "Parameter Usage Description",
-            "description" : "Describes the purpose and use of a parameter",
-            "type" : "string" },
-          "constraints" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-constraint" } },
-          "guidelines" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#assembly_oscal-catalog-common_parameter-guideline" } },
-          "values" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "$ref" : "#field_oscal-catalog-common_parameter-value" } },
-          "select" : 
-          { "$ref" : "#assembly_oscal-catalog-common_parameter-selection" },
-          "remarks" : 
-          { "$ref" : "#field_oscal-metadata_remarks" } },
-        "required" : 
-        [ "id" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-catalog-common:parameter-constraint" : 
-      { "title" : "Constraint",
-        "description" : "A formal or informal expression of a constraint or test",
-        "$id" : "#assembly_oscal-catalog-common_parameter-constraint",
-        "type" : "object",
-        "properties" : 
-        { "description" : 
-          { "title" : "Constraint Description",
-            "description" : "A textual summary of the constraint to be applied.",
-            "type" : "string" },
-          "tests" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Constraint Test",
-              "description" : "A test expression which is expected to be evaluated by a tool.",
-              "type" : "object",
-              "properties" : 
-              { "expression" : 
-                { "title" : "Constraint test",
-                  "description" : "A formal (executable) expression of a constraint",
-                  "$ref" : "#/definitions/StringDatatype" },
-                "remarks" : 
-                { "$ref" : "#field_oscal-metadata_remarks" } },
-              "required" : 
-              [ "expression" ],
-              "additionalProperties" : false } } },
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-catalog-common:parameter-guideline" : 
-      { "title" : "Guideline",
-        "description" : "A prose statement that provides a recommendation for the use of a parameter.",
-        "$id" : "#assembly_oscal-catalog-common_parameter-guideline",
-        "type" : "object",
-        "properties" : 
-        { "prose" : 
-          { "title" : "Guideline Text",
-            "description" : "Prose permits multiple paragraphs, lists, tables etc.",
-            "type" : "string" } },
-        "required" : 
-        [ "prose" ],
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-catalog-common:parameter-value" : 
-      { "title" : "Parameter Value",
-        "description" : "A parameter value or set of values.",
-        "$id" : "#field_oscal-catalog-common_parameter-value",
-        "$ref" : "#/definitions/StringDatatype" },
-      "oscal-ssp-oscal-catalog-common:parameter-selection" : 
-      { "title" : "Selection",
-        "description" : "Presenting a choice among alternatives",
-        "$id" : "#assembly_oscal-catalog-common_parameter-selection",
-        "type" : "object",
-        "properties" : 
-        { "how-many" : 
-          { "title" : "Parameter Cardinality",
-            "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
-            "allOf" : 
-            [ 
-              { "$ref" : "#/definitions/TokenDatatype" },
-              
-              { "enum" : 
-                [ "one",
-                  "one-or-more" ] } ] },
-          "choice" : 
-          { "type" : "array",
-            "minItems" : 1,
-            "items" : 
-            { "title" : "Choice",
-              "description" : "A value selection among several such options.",
-              "type" : "string" } } },
-        "additionalProperties" : false },
-      "oscal-ssp-oscal-catalog-common:include-all" : 
-      { "title" : "Include All",
-        "description" : "Include all controls from the imported catalog or profile resources.",
-        "$id" : "#assembly_oscal-catalog-common_include-all",
-        "type" : "object",
-        "additionalProperties" : false },
-      "Base64Datatype" : 
-      { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
-        "contentEncoding" : "base64" },
-      "DateDatatype" : 
-      { "description" : "A string representing a 24-hour period with an optional timezone.",
-        "type" : "string",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?$" },
-      "DateTimeWithTimezoneDatatype" : 
-      { "description" : "A string representing a point in time with a required timezone.",
-        "type" : "string",
-        "format" : "date-time",
-        "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
-      "EmailAddressDatatype" : 
-      { "description" : "An email address string formatted according to RFC 6531.",
-        "allOf" : 
-        [ 
-          { "$ref" : "#/definitions/StringDatatype" },
-          
-          { "type" : "string",
-            "format" : "email",
-            "pattern" : "^.+@.+$" } ] },
-      "IntegerDatatype" : 
-      { "description" : "A whole number value.",
-        "type" : "integer" },
-      "NonNegativeIntegerDatatype" : 
-      { "description" : "An integer value that is equal to or greater than 0.",
+           "minItems" : 1,
+           "items" : 
+           { "$ref" : "#assembly_oscal-metadata_link" } } },
+         "required" : 
+         [ "text" ],
+         "additionalProperties" : false },
+        "rlinks" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "title" : "Resource link",
+          "description" : "A URL-based pointer to an external resource with an optional hash for verification and change detection.",
+          "type" : "object",
+          "properties" : 
+          { "href" : 
+           { "title" : "Hypertext Reference",
+            "description" : "A resolvable URL pointing to the referenced resource.",
+            "$ref" : "#/definitions/URIReferenceDatatype" },
+           "media-type" : 
+           { "title" : "Media Type",
+            "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+            "$ref" : "#/definitions/StringDatatype" },
+           "hashes" : 
+           { "type" : "array",
+            "minItems" : 1,
+            "items" : 
+            { "$ref" : "#field_oscal-metadata_hash" } } },
+          "required" : 
+          [ "href" ],
+          "additionalProperties" : false } },
+        "base64" : 
+        { "title" : "Base64",
+         "description" : "A resource encoded using the Base64 alphabet defined by RFC 2045.",
+         "type" : "object",
+         "properties" : 
+         { "filename" : 
+          { "title" : "File Name",
+           "description" : "Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.",
+           "$ref" : "#/definitions/TokenDatatype" },
+          "media-type" : 
+          { "title" : "Media Type",
+           "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+           "$ref" : "#/definitions/StringDatatype" },
+          "value" : 
+          { "$ref" : "#/definitions/Base64Datatype" } },
+         "required" : 
+         [ "value" ],
+         "additionalProperties" : false },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "uuid" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:property" : 
+   { "title" : "Property",
+    "description" : "An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.",
+    "$id" : "#assembly_oscal-metadata_property",
+    "type" : "object",
+    "properties" : 
+    { "name" : 
+     { "title" : "Property Name",
+      "description" : "A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "uuid" : 
+     { "title" : "Property Universally Unique Identifier",
+      "description" : "A unique identifier for a property.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "ns" : 
+     { "title" : "Property Namespace",
+      "description" : "A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "value" : 
+     { "title" : "Property Value",
+      "description" : "Indicates the value of the attribute, characteristic, or quality.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "class" : 
+     { "title" : "Property Class",
+      "description" : "A textual label that provides a sub-type or characterization of the property's name.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "group" : 
+     { "title" : "Property Group",
+      "description" : "An identifier for relating distinct sets of properties.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "name",
+     "value" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:link" : 
+   { "title" : "Link",
+    "description" : "A reference to a local or remote resource, that has a specific relation to the containing object.",
+    "$id" : "#assembly_oscal-metadata_link",
+    "type" : "object",
+    "properties" : 
+    { "href" : 
+     { "title" : "Hypertext Reference",
+      "description" : "A resolvable URL reference to a resource.",
+      "$ref" : "#/definitions/URIReferenceDatatype" },
+     "rel" : 
+     { "title" : "Link Relation Type",
+      "description" : "Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "reference" ] } ] },
+     "media-type" : 
+     { "title" : "Media Type",
+      "description" : "A label that indicates the nature of a resource, as a data serialization or format.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "resource-fragment" : 
+     { "title" : "Resource Fragment",
+      "description" : "In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "text" : 
+     { "title" : "Link Text",
+      "description" : "A textual label to associate with the link, which may be used for presentation in a tool.",
+      "type" : "string" } },
+    "required" : 
+    [ "href" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:responsible-party" : 
+   { "title" : "Responsible Party",
+    "description" : "A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.",
+    "$id" : "#assembly_oscal-metadata_responsible-party",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role",
+      "description" : "A reference to a role performed by a party.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id",
+     "party-uuids" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:action" : 
+   { "title" : "Action",
+    "description" : "An action applied by a role within a given party to the content.",
+    "$id" : "#assembly_oscal-metadata_action",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Action Universally Unique Identifier",
+      "description" : "A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "date" : 
+     { "title" : "Action Occurrence Date",
+      "description" : "The date and time when the action occurred.",
+      "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+     "type" : 
+     { "title" : "Action Type",
+      "description" : "The type of action documented by the assembly, such as an approval.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "system" : 
+     { "title" : "Action Type System",
+      "description" : "Specifies the action type system used.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "system" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:responsible-role" : 
+   { "title" : "Responsible Role",
+    "description" : "A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.",
+    "$id" : "#assembly_oscal-metadata_responsible-role",
+    "type" : "object",
+    "properties" : 
+    { "role-id" : 
+     { "title" : "Responsible Role ID",
+      "description" : "A human-oriented identifier reference to a role performed.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "party-uuids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_party-uuid" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "role-id" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:hash" : 
+   { "title" : "Hash",
+    "description" : "A representation of a cryptographic digest generated over a resource using a specified hash algorithm.",
+    "$id" : "#field_oscal-metadata_hash",
+    "type" : "object",
+    "properties" : 
+    { "algorithm" : 
+     { "title" : "Hash algorithm",
+      "description" : "The digest method by which a hash is derived.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "SHA-224",
+         "SHA-256",
+         "SHA-384",
+         "SHA-512",
+         "SHA3-224",
+         "SHA3-256",
+         "SHA3-384",
+         "SHA3-512" ] } ] },
+     "value" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "value",
+     "algorithm" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:remarks" : 
+   { "title" : "Remarks",
+    "description" : "Additional commentary about the containing object.",
+    "$id" : "#field_oscal-metadata_remarks",
+    "type" : "string" },
+   "oscal-ssp-oscal-metadata:published" : 
+   { "title" : "Publication Timestamp",
+    "description" : "The date and time the document was last made available.",
+    "$id" : "#field_oscal-metadata_published",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-ssp-oscal-metadata:last-modified" : 
+   { "title" : "Last Modified Timestamp",
+    "description" : "The date and time the document was last stored for later retrieval.",
+    "$id" : "#field_oscal-metadata_last-modified",
+    "$ref" : "#/definitions/DateTimeWithTimezoneDatatype" },
+   "oscal-ssp-oscal-metadata:version" : 
+   { "title" : "Document Version",
+    "description" : "Used to distinguish a specific revision of an OSCAL document from other previous and future versions.",
+    "$id" : "#field_oscal-metadata_version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-metadata:oscal-version" : 
+   { "title" : "OSCAL Version",
+    "description" : "The OSCAL model version the document was authored against and will conform to as valid.",
+    "$id" : "#field_oscal-metadata_oscal-version",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-metadata:email-address" : 
+   { "title" : "Email Address",
+    "description" : "An email address as defined by RFC 5322 Section 3.4.1.",
+    "$id" : "#field_oscal-metadata_email-address",
+    "$ref" : "#/definitions/EmailAddressDatatype" },
+   "oscal-ssp-oscal-metadata:telephone-number" : 
+   { "title" : "Telephone Number",
+    "description" : "A telephone service number as defined by ITU-T E.164.",
+    "$id" : "#field_oscal-metadata_telephone-number",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "type flag",
+      "description" : "Indicates the type of phone number.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "office",
+         "mobile" ] } ] },
+     "number" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "number" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:address" : 
+   { "title" : "Address",
+    "description" : "A postal address for the location.",
+    "$id" : "#assembly_oscal-metadata_address",
+    "type" : "object",
+    "properties" : 
+    { "type" : 
+     { "title" : "Address Type",
+      "description" : "Indicates the type of address.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "home",
+         "work" ] } ] },
+     "addr-lines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_addr-line" } },
+     "city" : 
+     { "title" : "City",
+      "description" : "City, town or geographical region for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "state" : 
+     { "title" : "State",
+      "description" : "State, province or analogous geographical region for a mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "postal-code" : 
+     { "title" : "Postal Code",
+      "description" : "Postal or ZIP code for mailing address.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "country" : 
+     { "title" : "Country Code",
+      "description" : "The ISO 3166-1 alpha-2 country code for the mailing address.",
+      "$ref" : "#/definitions/StringDatatype" } },
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-metadata:addr-line" : 
+   { "title" : "Address line",
+    "description" : "A single line of an address.",
+    "$id" : "#field_oscal-metadata_addr-line",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-metadata:document-id" : 
+   { "title" : "Document Identifier",
+    "description" : "A document identifier qualified by an identifier scheme.",
+    "$id" : "#field_oscal-metadata_document-id",
+    "type" : "object",
+    "properties" : 
+    { "scheme" : 
+     { "title" : "Document Identification Scheme",
+      "description" : "Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "http://www.doi.org/" ] } ] },
+     "identifier" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "identifier" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:system-component" : 
+   { "title" : "Component",
+    "description" : "A defined component that can be part of an implemented system.",
+    "$id" : "#assembly_oscal-implementation-common_system-component",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Component Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "type" : 
+     { "title" : "Component Type",
+      "description" : "A category describing the purpose of the component.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/StringDatatype" },
+       
+       { "enum" : 
+        [ "this-system",
+         "system",
+         "interconnection",
+         "software",
+         "hardware",
+         "service",
+         "policy",
+         "physical",
+         "process-procedure",
+         "plan",
+         "guidance",
+         "standard",
+         "validation",
+         "network" ] } ] },
+     "title" : 
+     { "title" : "Component Title",
+      "description" : "A human readable name for the system component.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Component Description",
+      "description" : "A description of the component, including information about its function.",
+      "type" : "string" },
+     "purpose" : 
+     { "title" : "Purpose",
+      "description" : "A summary of the technological or business purpose of the component.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "status" : 
+     { "title" : "Status",
+      "description" : "Describes the operational status of the system component.",
+      "type" : "object",
+      "properties" : 
+      { "state" : 
+       { "title" : "State",
+        "description" : "The operational status.",
         "allOf" : 
         [ 
-          { "$ref" : "#/definitions/IntegerDatatype" },
-          
-          { "type" : "number",
-            "minimum" : 0 } ] },
-      "StringDatatype" : 
-      { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
-        "type" : "string",
-        "pattern" : "^\\S(.*\\S)?$" },
-      "TokenDatatype" : 
-      { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
-        "type" : "string",
-        "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
-      "URIDatatype" : 
-      { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
-        "type" : "string",
-        "format" : "uri",
-        "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
-      "URIReferenceDatatype" : 
-      { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
-        "type" : "string",
-        "format" : "uri-reference" },
-      "UUIDDatatype" : 
-      { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
-        "type" : "string",
-        "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+         { "$ref" : "#/definitions/TokenDatatype" },
+         
+         { "enum" : 
+          [ "under-development",
+           "operational",
+           "disposition",
+           "other" ] } ] },
+       "remarks" : 
+       { "$ref" : "#field_oscal-metadata_remarks" } },
+      "required" : 
+      [ "state" ],
+      "additionalProperties" : false },
+     "responsible-roles" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-role" } },
+     "protocols" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_protocol" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "type",
+     "title",
+     "description",
+     "status" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:protocol" : 
+   { "title" : "Service Protocol Information",
+    "description" : "Information about the protocol used to provide a service.",
+    "$id" : "#assembly_oscal-implementation-common_protocol",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Service Protocol Information Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "name" : 
+     { "title" : "Protocol Name",
+      "description" : "The common name of the protocol, which should be the appropriate \"service name\" from the IANA Service Name and Transport Protocol Port Number Registry.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "title" : 
+     { "title" : "Protocol Title",
+      "description" : "A human readable name for the protocol (e.g., Transport Layer Security).",
+      "type" : "string" },
+     "port-ranges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_port-range" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:port-range" : 
+   { "title" : "Port Range",
+    "description" : "Where applicable this is the IPv4 port range on which the service operates.",
+    "$id" : "#assembly_oscal-implementation-common_port-range",
+    "type" : "object",
     "properties" : 
-    { "$schema" : 
-      { "$ref" : "#json-schema-directive" },
-      "system-security-plan" : 
-      { "$ref" : "#assembly_oscal-ssp_system-security-plan" } },
+    { "start" : 
+     { "title" : "Start",
+      "description" : "Indicates the starting port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "end" : 
+     { "title" : "End",
+      "description" : "Indicates the ending port number in a port range",
+      "$ref" : "#/definitions/NonNegativeIntegerDatatype" },
+     "transport" : 
+     { "title" : "Transport",
+      "description" : "Indicates the transport type.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "TCP",
+         "UDP" ] } ] } },
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:implementation-status" : 
+   { "title" : "Implementation Status",
+    "description" : "Indicates the degree to which the a given control is implemented.",
+    "$id" : "#assembly_oscal-implementation-common_implementation-status",
+    "type" : "object",
+    "properties" : 
+    { "state" : 
+     { "title" : "Implementation State",
+      "description" : "Identifies the implementation status of the control or control objective.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "implemented",
+         "partial",
+         "planned",
+         "alternative",
+         "not-applicable" ] } ] },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "state" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:system-user" : 
+   { "title" : "System User",
+    "description" : "A type of user that interacts with the system based on an associated role.",
+    "$id" : "#assembly_oscal-implementation-common_system-user",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "User Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "title" : 
+     { "title" : "User Title",
+      "description" : "A name given to the user, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "short-name" : 
+     { "title" : "User Short Name",
+      "description" : "A short common name, abbreviation, or acronym for the user.",
+      "$ref" : "#/definitions/StringDatatype" },
+     "description" : 
+     { "title" : "User Description",
+      "description" : "A summary of the user's purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "role-ids" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-metadata_role-id" } },
+     "authorized-privileges" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-implementation-common_authorized-privilege" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:authorized-privilege" : 
+   { "title" : "Privilege",
+    "description" : "Identifies a specific system privilege held by the user, along with an associated description and/or rationale for the privilege.",
+    "$id" : "#assembly_oscal-implementation-common_authorized-privilege",
+    "type" : "object",
+    "properties" : 
+    { "title" : 
+     { "title" : "Privilege Title",
+      "description" : "A human readable name for the privilege.",
+      "type" : "string" },
+     "description" : 
+     { "title" : "Privilege Description",
+      "description" : "A summary of the privilege's purpose within the system.",
+      "type" : "string" },
+     "functions-performed" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-implementation-common_function-performed" } } },
+    "required" : 
+    [ "title",
+     "functions-performed" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:function-performed" : 
+   { "title" : "Functions Performed",
+    "description" : "Describes a function performed for a given authorized privilege by this user class.",
+    "$id" : "#field_oscal-implementation-common_function-performed",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-implementation-common:inventory-item" : 
+   { "title" : "Inventory Item",
+    "description" : "A single managed inventory item within the system.",
+    "$id" : "#assembly_oscal-implementation-common_inventory-item",
+    "type" : "object",
+    "properties" : 
+    { "uuid" : 
+     { "title" : "Inventory Item Universally Unique Identifier",
+      "description" : "A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.",
+      "$ref" : "#/definitions/UUIDDatatype" },
+     "description" : 
+     { "title" : "Inventory Item Description",
+      "description" : "A summary of the inventory item stating its purpose within the system.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "responsible-parties" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+     "implemented-components" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Implemented Component",
+       "description" : "The set of components that are implemented in a given system inventory item.",
+       "type" : "object",
+       "properties" : 
+       { "component-uuid" : 
+        { "title" : "Component Universally Unique Identifier Reference",
+         "description" : "A machine-oriented identifier reference to a component that is implemented as part of an inventory item.",
+         "$ref" : "#/definitions/UUIDDatatype" },
+        "props" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_property" } },
+        "links" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_link" } },
+        "responsible-parties" : 
+        { "type" : "array",
+         "minItems" : 1,
+         "items" : 
+         { "$ref" : "#assembly_oscal-metadata_responsible-party" } },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "component-uuid" ],
+       "additionalProperties" : false } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "uuid",
+     "description" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:set-parameter" : 
+   { "title" : "Set Parameter Value",
+    "description" : "Identifies the parameter that will be set by the enclosed value.",
+    "$id" : "#assembly_oscal-implementation-common_set-parameter",
+    "type" : "object",
+    "properties" : 
+    { "param-id" : 
+     { "title" : "Parameter ID",
+      "description" : "A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Parameter Value",
+       "description" : "A parameter value or set of values.",
+       "$ref" : "#/definitions/StringDatatype" } },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
+    "required" : 
+    [ "param-id",
+     "values" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-implementation-common:system-id" : 
+   { "title" : "System Identification",
+    "description" : "A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.",
+    "$id" : "#field_oscal-implementation-common_system-id",
+    "type" : "object",
+    "properties" : 
+    { "identifier-type" : 
+     { "title" : "Identification System Type",
+      "description" : "Identifies the identification system from which the provided identifier was assigned.",
+      "anyOf" : 
+      [ 
+       { "$ref" : "#/definitions/URIDatatype" },
+       
+       { "enum" : 
+        [ "https://fedramp.gov",
+         "http://fedramp.gov/ns/oscal",
+         "https://ietf.org/rfc/rfc4122",
+         "http://ietf.org/rfc/rfc4122" ] } ] },
+     "id" : 
+     { "$ref" : "#/definitions/StringDatatype" } },
+    "required" : 
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-control-common:part" : 
+   { "title" : "Part",
+    "description" : "An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.",
+    "$id" : "#assembly_oscal-control-common_part",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Part Identifier",
+      "description" : "A unique identifier for the part.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "name" : 
+     { "title" : "Part Name",
+      "description" : "A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "ns" : 
+     { "title" : "Part Namespace",
+      "description" : "An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.",
+      "$ref" : "#/definitions/URIDatatype" },
+     "class" : 
+     { "title" : "Part Class",
+      "description" : "An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "title" : 
+     { "title" : "Part Title",
+      "description" : "An optional name given to the part, which may be used by a tool for display and navigation.",
+      "type" : "string" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "prose" : 
+     { "title" : "Part Text",
+      "description" : "Permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" },
+     "parts" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_part" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } } },
+    "required" : 
+    [ "name" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-control-common:parameter" : 
+   { "title" : "Parameter",
+    "description" : "Parameters provide a mechanism for the dynamic assignment of value(s) in a control.",
+    "$id" : "#assembly_oscal-control-common_parameter",
+    "type" : "object",
+    "properties" : 
+    { "id" : 
+     { "title" : "Parameter Identifier",
+      "description" : "A unique identifier for the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "class" : 
+     { "title" : "Parameter Class",
+      "description" : "A textual label that provides a characterization of the type, purpose, use or scope of the parameter.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "depends-on" : 
+     { "title" : "Depends on",
+      "description" : "(deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.",
+      "$ref" : "#/definitions/TokenDatatype" },
+     "props" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_property" } },
+     "links" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-metadata_link" } },
+     "label" : 
+     { "title" : "Parameter Label",
+      "description" : "A short, placeholder name for the parameter, which can be used as a substitute for a value if no value is assigned.",
+      "type" : "string" },
+     "usage" : 
+     { "title" : "Parameter Usage Description",
+      "description" : "Describes the purpose and use of a parameter.",
+      "type" : "string" },
+     "constraints" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-constraint" } },
+     "guidelines" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#assembly_oscal-control-common_parameter-guideline" } },
+     "values" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "$ref" : "#field_oscal-control-common_parameter-value" } },
+     "select" : 
+     { "$ref" : "#assembly_oscal-control-common_parameter-selection" },
+     "remarks" : 
+     { "$ref" : "#field_oscal-metadata_remarks" } },
     "required" : 
-    [ "system-security-plan" ],
-    "additionalProperties" : false }
\ No newline at end of file
+    [ "id" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-control-common:parameter-constraint" : 
+   { "title" : "Constraint",
+    "description" : "A formal or informal expression of a constraint or test.",
+    "$id" : "#assembly_oscal-control-common_parameter-constraint",
+    "type" : "object",
+    "properties" : 
+    { "description" : 
+     { "title" : "Constraint Description",
+      "description" : "A textual summary of the constraint to be applied.",
+      "type" : "string" },
+     "tests" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Constraint Test",
+       "description" : "A test expression which is expected to be evaluated by a tool.",
+       "type" : "object",
+       "properties" : 
+       { "expression" : 
+        { "title" : "Constraint test",
+         "description" : "A formal (executable) expression of a constraint.",
+         "$ref" : "#/definitions/StringDatatype" },
+        "remarks" : 
+        { "$ref" : "#field_oscal-metadata_remarks" } },
+       "required" : 
+       [ "expression" ],
+       "additionalProperties" : false } } },
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-control-common:parameter-guideline" : 
+   { "title" : "Guideline",
+    "description" : "A prose statement that provides a recommendation for the use of a parameter.",
+    "$id" : "#assembly_oscal-control-common_parameter-guideline",
+    "type" : "object",
+    "properties" : 
+    { "prose" : 
+     { "title" : "Guideline Text",
+      "description" : "Prose permits multiple paragraphs, lists, tables etc.",
+      "type" : "string" } },
+    "required" : 
+    [ "prose" ],
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-control-common:parameter-value" : 
+   { "title" : "Parameter Value",
+    "description" : "A parameter value or set of values.",
+    "$id" : "#field_oscal-control-common_parameter-value",
+    "$ref" : "#/definitions/StringDatatype" },
+   "oscal-ssp-oscal-control-common:parameter-selection" : 
+   { "title" : "Selection",
+    "description" : "Presenting a choice among alternatives.",
+    "$id" : "#assembly_oscal-control-common_parameter-selection",
+    "type" : "object",
+    "properties" : 
+    { "how-many" : 
+     { "title" : "Parameter Cardinality",
+      "description" : "Describes the number of selections that must occur. Without this setting, only one value should be assumed to be permitted.",
+      "allOf" : 
+      [ 
+       { "$ref" : "#/definitions/TokenDatatype" },
+       
+       { "enum" : 
+        [ "one",
+         "one-or-more" ] } ] },
+     "choice" : 
+     { "type" : "array",
+      "minItems" : 1,
+      "items" : 
+      { "title" : "Choice",
+       "description" : "A value selection among several such options.",
+       "type" : "string" } } },
+    "additionalProperties" : false },
+   "oscal-ssp-oscal-control-common:include-all" : 
+   { "title" : "Include All",
+    "description" : "Include all controls from the imported catalog or profile resources.",
+    "$id" : "#assembly_oscal-control-common_include-all",
+    "type" : "object",
+    "additionalProperties" : false },
+   "Base64Datatype" : 
+   { "description" : "Binary data encoded using the Base 64 encoding algorithm as defined by RFC4648.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Za-z+/]+={0,2}$",
+    "contentEncoding" : "base64" },
+   "DateDatatype" : 
+   { "description" : "A string representing a 24-hour period with an optional timezone.",
+    "type" : "string",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))(Z|[+-][0-9]{2}:[0-9]{2})?$" },
+   "DateTimeWithTimezoneDatatype" : 
+   { "description" : "A string representing a point in time with a required timezone.",
+    "type" : "string",
+    "format" : "date-time",
+    "pattern" : "^(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))$" },
+   "EmailAddressDatatype" : 
+   { "description" : "An email address string formatted according to RFC 6531.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/StringDatatype" },
+     
+     { "type" : "string",
+      "format" : "email",
+      "pattern" : "^.+@.+$" } ] },
+   "IntegerDatatype" : 
+   { "description" : "A whole number value.",
+    "type" : "integer" },
+   "NonNegativeIntegerDatatype" : 
+   { "description" : "An integer value that is equal to or greater than 0.",
+    "allOf" : 
+    [ 
+     { "$ref" : "#/definitions/IntegerDatatype" },
+     
+     { "type" : "number",
+      "minimum" : 0 } ] },
+   "StringDatatype" : 
+   { "description" : "A non-empty string with leading and trailing whitespace disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+",
+    "type" : "string",
+    "pattern" : "^\\S(.*\\S)?$" },
+   "TokenDatatype" : 
+   { "description" : "A non-colonized name as defined by XML Schema Part 2: Datatypes Second Edition. https://www.w3.org/TR/xmlschema11-2/#NCName.",
+    "type" : "string",
+    "pattern" : "^(\\p{L}|_)(\\p{L}|\\p{N}|[.\\-_])*$" },
+   "URIDatatype" : 
+   { "description" : "A universal resource identifier (URI) formatted according to RFC3986.",
+    "type" : "string",
+    "format" : "uri",
+    "pattern" : "^[a-zA-Z][a-zA-Z0-9+\\-.]+:.+$" },
+   "URIReferenceDatatype" : 
+   { "description" : "A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.",
+    "type" : "string",
+    "format" : "uri-reference" },
+   "UUIDDatatype" : 
+   { "description" : "A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC 4122.",
+    "type" : "string",
+    "pattern" : "^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}$" } },
+  "properties" : 
+  { "$schema" : 
+   { "$ref" : "#json-schema-directive" },
+   "system-security-plan" : 
+   { "$ref" : "#assembly_oscal-ssp_system-security-plan" } },
+  "required" : 
+  [ "system-security-plan" ],
+  "additionalProperties" : false }
\ No newline at end of file
diff --git a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
index 67dbacb47b..2de90331fa 100644
--- a/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-plan_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -130,6 +130,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -142,6 +143,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -152,64 +154,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -369,8 +339,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="reviewed-controls" -->
       <assembly name="reviewed-controls"
-                key="reviewed-controls"
-                gi="reviewed-controls">
+                 key="reviewed-controls"
+                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
          </xsl:if>
@@ -386,9 +356,9 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
@@ -398,8 +368,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-objective" -->
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="include-objective">
+                 name="select-objective-by-id"
+                 gi="include-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
    </xsl:template>
@@ -407,8 +377,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-objective" -->
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="exclude-objective">
+                 name="select-objective-by-id"
+                 gi="exclude-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
    </xsl:template>
@@ -416,8 +386,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-controls" -->
       <assembly name="reviewed-controls"
-                key="related-controls"
-                gi="related-controls">
+                 key="related-controls"
+                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
          </xsl:if>
@@ -469,8 +439,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-assets" -->
       <assembly name="assessment-assets"
-                key="assessment-assets"
-                gi="assessment-assets">
+                 key="assessment-assets"
+                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
          </xsl:if>
@@ -525,12 +495,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -538,8 +508,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -548,16 +518,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -566,16 +536,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='party-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -584,16 +554,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='role-ids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -602,16 +572,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='functions-performed']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -631,797 +601,890 @@
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="assessment-plan/@uuid" -->
+                  priority="1"><!-- XML match="assessment-plan/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="assessment-plan/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="assessment-plan/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="assessment-plan/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="assessment-plan/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="assessment-plan/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="assessment-plan/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']" priority="1"><!-- XML match="import-ssp/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 priority="7"><!-- XML match="assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state" -->
+                  priority="7"><!-- XML match="assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-role/@role-id" -->
+                  priority="1"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="protocol/@uuid" -->
+                  priority="1"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="protocol/@name" -->
+                  priority="1"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 priority="1"><!-- XML match="port-range/@start" -->
+                  priority="1"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 priority="1"><!-- XML match="port-range/@end" -->
+                  priority="1"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 priority="1"><!-- XML match="port-range/@transport" -->
+                  priority="1"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="inventory-item/@uuid" -->
+                  priority="1"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 priority="8"><!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid" -->
+                  priority="8"><!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"><!-- XML match="objectives-and-methods/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']" priority="1"><!-- XML match="part/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="activity/@uuid" -->
+                  priority="1"><!-- XML match="activity/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="assessment-plan/local-definitions/activity/step/@uuid" -->
+                  priority="8"><!-- XML match="assessment-plan/local-definitions/activity/step/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"><!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-plan/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/reviewed-controls/control-selection/exclude-control/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"><!-- XML match="include-objective/@objective-id | exclude-objective/@objective-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="objective-id"
-            key="objective-id"
-            gi="objective-id">
+             as-type="token"
+             name="objective-id"
+             key="objective-id"
+             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="part/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='assessment-subjects']/j:map/j:string[@key='type'] | j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="assessment-subject/@type | subject/@type" -->
+                  priority="1"><!-- XML match="assessment-subject/@type | subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='assessment-subjects']/j:map/j:string[@key='type'] | j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/@uuid" -->
+                  priority="6"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
-                 priority="8"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
+                  priority="8"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="task/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type']" priority="1"><!-- XML match="task/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/on-date/@date" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/on-date/@date" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@start" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@start" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@end" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@end" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@period" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@period" -->
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@unit" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 priority="7"><!-- XML match="assessment-plan//task/dependency/@task-uuid" -->
+                  priority="7"><!-- XML match="assessment-plan//task/dependency/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 priority="7"><!-- XML match="assessment-plan//task/associated-activity/@activity-uuid" -->
+                  priority="7"><!-- XML match="assessment-plan//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="assessment-plan/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="assessment-plan/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="assessment-plan/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="assessment-plan/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="assessment-plan/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="assessment-plan/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="assessment-plan/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="assessment-plan/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1429,22 +1492,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1452,22 +1515,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1475,22 +1538,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1498,22 +1561,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1521,14 +1584,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -1543,14 +1606,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1558,15 +1621,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1574,22 +1637,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1597,22 +1660,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1620,22 +1683,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1643,22 +1706,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1666,22 +1729,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1689,41 +1752,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-plan/metadata/document-id-->
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1731,22 +1794,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1754,22 +1831,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1777,23 +1854,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1801,22 +1878,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1824,22 +1901,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1847,14 +1940,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -1870,34 +1963,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1905,22 +1998,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1928,22 +2021,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1951,22 +2044,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1974,79 +2067,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-plan/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2054,22 +2148,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2077,22 +2191,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2100,41 +2214,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-plan/metadata/party/external-id-->
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2142,52 +2256,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-plan/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -2200,34 +2314,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2235,22 +2349,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2258,22 +2372,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2281,22 +2395,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2304,41 +2418,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2346,19 +2460,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']"
-                 priority="3">
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions" -->
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -2371,15 +2531,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2387,23 +2547,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2411,22 +2571,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -2434,22 +2594,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2457,14 +2617,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/status" -->
       <assembly name="status" key="status" gi="status">
@@ -2476,15 +2636,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2492,22 +2652,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2515,23 +2675,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2539,22 +2699,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2562,22 +2722,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2585,14 +2745,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component" -->
       <assembly name="implemented-component" gi="implemented-component">
@@ -2604,15 +2764,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2620,22 +2780,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2643,22 +2803,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2666,22 +2826,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2689,23 +2849,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2713,22 +2873,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2736,22 +2896,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2759,23 +2919,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2783,23 +2943,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2807,22 +2967,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2830,22 +2990,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2853,46 +3013,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for assessment-plan/local-definitions/objectives-and-methods//part-->
    <xsl:template priority="4"
-                 match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2900,22 +3060,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2923,23 +3083,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2947,22 +3107,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2970,14 +3130,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step" -->
       <assembly name="step" gi="step">
@@ -2992,15 +3152,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3008,23 +3168,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3032,22 +3192,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3055,23 +3215,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3079,22 +3239,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3102,14 +3262,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection" -->
       <assembly name="control-selection" gi="control-selection">
@@ -3123,16 +3283,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3140,22 +3300,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3163,14 +3323,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
       <assembly name="select-control-by-id" gi="include-control">
@@ -3179,26 +3339,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
       <assembly name="select-control-by-id" gi="exclude-control">
@@ -3207,26 +3367,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
       <assembly name="control-objective-selection" gi="control-objective-selection">
@@ -3240,16 +3400,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3257,22 +3417,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3280,22 +3440,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/step/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3303,23 +3463,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3327,22 +3487,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3350,14 +3510,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection" -->
       <assembly name="control-selection" gi="control-selection">
@@ -3371,16 +3531,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3388,22 +3548,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3411,14 +3571,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control" -->
       <assembly name="select-control-by-id" gi="include-control">
@@ -3427,26 +3587,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control" -->
       <assembly name="select-control-by-id" gi="exclude-control">
@@ -3455,26 +3615,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection" -->
       <assembly name="control-objective-selection" gi="control-objective-selection">
@@ -3488,16 +3648,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3505,22 +3665,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3528,22 +3688,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/local-definitions/activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3551,19 +3711,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']"
-                 priority="3">
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions" -->
       <assembly name="terms-and-conditions"
-                key="terms-and-conditions"
-                gi="terms-and-conditions">
+                 key="terms-and-conditions"
+                 gi="terms-and-conditions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
          </xsl:if>
@@ -3571,15 +3731,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3587,46 +3747,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for assessment-plan/terms-and-conditions//part-->
    <xsl:template priority="3"
-                 match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/terms-and-conditions//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3634,23 +3794,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3658,22 +3818,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3681,14 +3841,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection" -->
       <assembly name="control-selection" gi="control-selection">
@@ -3702,16 +3862,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3719,22 +3879,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3742,14 +3902,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control" -->
       <assembly name="select-control-by-id" gi="include-control">
@@ -3758,26 +3918,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control" -->
       <assembly name="select-control-by-id" gi="exclude-control">
@@ -3786,26 +3946,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection" -->
       <assembly name="control-objective-selection" gi="control-objective-selection">
@@ -3819,16 +3979,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3836,22 +3996,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3859,23 +4019,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3883,22 +4043,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3906,22 +4066,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3929,22 +4089,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3952,22 +4112,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3975,23 +4135,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3999,22 +4159,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -4022,22 +4182,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4045,14 +4205,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/status" -->
       <assembly name="status" key="status" gi="status">
@@ -4064,15 +4224,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4080,22 +4240,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4103,14 +4263,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform" -->
       <assembly name="assessment-platform" gi="assessment-platform">
@@ -4123,15 +4283,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4139,22 +4299,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4162,14 +4322,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component" -->
       <assembly name="uses-component" gi="uses-component">
@@ -4181,15 +4341,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4197,22 +4357,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4220,22 +4380,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4243,23 +4403,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4267,22 +4427,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4290,14 +4450,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing" -->
       <assembly name="timing" key="timing" gi="timing">
@@ -4310,7 +4470,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/on-date" -->
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
@@ -4321,13 +4481,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -4336,13 +4496,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -4351,7 +4511,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/dependency" -->
       <assembly name="dependency" gi="dependency">
@@ -4360,7 +4520,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity" -->
       <assembly name="associated-activity" gi="associated-activity">
@@ -4373,15 +4533,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4389,22 +4549,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4412,23 +4572,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4436,22 +4596,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4459,22 +4619,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4482,22 +4642,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4505,23 +4665,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4529,22 +4689,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4552,22 +4712,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4575,22 +4735,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4598,22 +4758,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan//task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4621,14 +4781,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -4644,15 +4804,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4660,23 +4820,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4684,33 +4844,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-plan/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -4723,15 +4883,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4739,22 +4899,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4762,14 +4922,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -4779,14 +4939,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-plan/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -4797,7 +4957,7 @@
    </xsl:template>
    <!-- matching assessment-plan/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -4811,8 +4971,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -4822,8 +4982,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -4852,15 +5012,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -4891,9 +5051,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -4931,8 +5091,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -4943,7 +5103,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -4962,9 +5122,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -4978,7 +5138,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -4992,9 +5152,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -5173,40 +5333,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
index 0e2925a277..e680ab39b4 100644
--- a/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_assessment-results_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -92,8 +92,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results" -->
       <assembly name="assessment-results"
-                key="assessment-results"
-                gi="assessment-results">
+                 key="assessment-results"
+                 gi="assessment-results">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
          </xsl:if>
@@ -128,6 +128,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -140,6 +141,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -150,64 +152,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -283,8 +253,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="reviewed-controls" -->
       <assembly name="reviewed-controls"
-                key="reviewed-controls"
-                gi="reviewed-controls">
+                 key="reviewed-controls"
+                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
          </xsl:if>
@@ -300,9 +270,9 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
@@ -312,8 +282,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-objective" -->
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="include-objective">
+                 name="select-objective-by-id"
+                 gi="include-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
    </xsl:template>
@@ -321,8 +291,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-objective" -->
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="exclude-objective">
+                 name="select-objective-by-id"
+                 gi="exclude-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
    </xsl:template>
@@ -341,8 +311,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-controls" -->
       <assembly name="reviewed-controls"
-                key="related-controls"
-                gi="related-controls">
+                 key="related-controls"
+                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
          </xsl:if>
@@ -452,8 +422,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-assets" -->
       <assembly name="assessment-assets"
-                key="assessment-assets"
-                gi="assessment-assets">
+                 key="assessment-assets"
+                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
          </xsl:if>
@@ -669,8 +639,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="implementation-status" -->
       <assembly name="implementation-status"
-                key="implementation-status"
-                gi="implementation-status">
+                 key="implementation-status"
+                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
          </xsl:if>
@@ -692,12 +662,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -705,8 +675,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -715,16 +685,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -733,16 +703,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='party-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -751,16 +721,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='role-ids']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -769,16 +739,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='functions-performed']/j:string"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -787,11 +757,11 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status" -->
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status"
-             gi="status"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status"
+              gi="status"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -799,8 +769,8 @@
       </field>
    </xsl:template>
    <xsl:template match="(j:map[@key='status'] | j:string[@key='status'])"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -824,11 +794,11 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status-change" -->
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status-change"
-             gi="status-change"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status-change"
+              gi="status-change"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
@@ -836,8 +806,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='status-change']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -857,1248 +827,1341 @@
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="assessment-results/@uuid" -->
+                  priority="1"><!-- XML match="assessment-results/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="assessment-results/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="assessment-results/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="assessment-results/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="assessment-results/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="assessment-results/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="assessment-results/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-ap']/j:string[@key='href']" priority="1"><!-- XML match="import-ap/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-ap']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"><!-- XML match="objectives-and-methods/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']" priority="1"><!-- XML match="part/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="activity/@uuid" -->
+                  priority="1"><!-- XML match="activity/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="assessment-results/local-definitions/activity/step/@uuid" -->
+                  priority="8"><!-- XML match="assessment-results/local-definitions/activity/step/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"><!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-results/result/reviewed-controls/control-selection/include-control/@control-id | assessment-results/result/reviewed-controls/control-selection/exclude-control/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"><!-- XML match="include-objective/@objective-id | exclude-objective/@objective-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="objective-id"
-            key="objective-id"
-            gi="objective-id">
+             as-type="token"
+             name="objective-id"
+             key="objective-id"
+             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-role/@role-id" -->
+                  priority="1"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='results']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="result/@uuid" -->
+                  priority="1"><!-- XML match="result/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='results']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 priority="9"><!-- XML match="assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state" -->
+                  priority="9"><!-- XML match="assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="protocol/@uuid" -->
+                  priority="1"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="protocol/@name" -->
+                  priority="1"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 priority="1"><!-- XML match="port-range/@start" -->
+                  priority="1"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 priority="1"><!-- XML match="port-range/@end" -->
+                  priority="1"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 priority="1"><!-- XML match="port-range/@transport" -->
+                  priority="1"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="inventory-item/@uuid" -->
+                  priority="1"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 priority="10"><!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid" -->
+                  priority="10"><!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
-                 priority="11"><!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
+                  priority="11"><!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid'] | j:array[@key='tasks']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="assessment-task/@uuid | task/@uuid" -->
+                  priority="1"><!-- XML match="assessment-task/@uuid | task/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid'] | j:array[@key='tasks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type'] | j:array[@key='tasks']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="assessment-task/@type | task/@type" -->
+                  priority="1"><!-- XML match="assessment-task/@type | task/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type'] | j:array[@key='tasks']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date" -->
+                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start" -->
+                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end" -->
+                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period" -->
+                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period" -->
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit" -->
+                  priority="11"><!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 priority="10"><!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid" -->
+                  priority="10"><!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 priority="10"><!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid" -->
+                  priority="10"><!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="subject/@type" -->
+                  priority="1"><!-- XML match="subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="15"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="15"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="15"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="15"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="part/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="assessment-results/result/assessment-log/entry/@uuid" -->
+                  priority="8"><!-- XML match="assessment-results/result/assessment-log/entry/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"
-                 priority="1"><!-- XML match="logged-by/@party-uuid" -->
+                  priority="1"><!-- XML match="logged-by/@party-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="party-uuid"
-            key="party-uuid"
-            gi="party-uuid">
+             as-type="uuid"
+             name="party-uuid"
+             key="party-uuid"
+             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="logged-by/@role-id" -->
+                  priority="1"><!-- XML match="logged-by/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"
-                 priority="1"><!-- XML match="related-task/@task-uuid" -->
+                  priority="1"><!-- XML match="related-task/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
-                 priority="11"><!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid" -->
+                  priority="11"><!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-placeholder-uuid"
-            key="subject-placeholder-uuid"
-            gi="subject-placeholder-uuid">
+             as-type="uuid"
+             name="subject-placeholder-uuid"
+             key="subject-placeholder-uuid"
+             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="observation/@uuid" -->
+                  priority="1"><!-- XML match="observation/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']" priority="1"><!-- XML match="actor/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"
-                 priority="1"><!-- XML match="actor/@actor-uuid" -->
+                  priority="1"><!-- XML match="actor/@actor-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="actor-uuid"
-            key="actor-uuid"
-            gi="actor-uuid">
+             as-type="uuid"
+             name="actor-uuid"
+             key="actor-uuid"
+             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="actor/@role-id" -->
+                  priority="1"><!-- XML match="actor/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="assessment-results/result/observation/subject/@subject-uuid | assessment-results/result/risk/mitigating-factor/subject/@subject-uuid | assessment-results/result/risk/response/required-asset/subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="assessment-results/result/observation/subject/@type | assessment-results/result/risk/mitigating-factor/subject/@type | assessment-results/result/risk/response/required-asset/subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href']"
-                 priority="9"><!-- XML match="assessment-results/result/observation/relevant-evidence/@href" -->
+                  priority="9"><!-- XML match="assessment-results/result/observation/relevant-evidence/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="risk/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"
-                 priority="1"><!-- XML match="threat-id/@system" -->
+                  priority="1"><!-- XML match="threat-id/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="threat-id/@href" -->
+                  priority="1"><!-- XML match="threat-id/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@name" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@system" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@value" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@implementation-uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@implementation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="implementation-uuid"
-            key="implementation-uuid"
-            gi="implementation-uuid">
+             as-type="uuid"
+             name="implementation-uuid"
+             key="implementation-uuid"
+             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/response/@uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/response/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/response/@lifecycle" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/response/@lifecycle" -->
       <flag in-json="string"
-            as-type="token"
-            name="lifecycle"
-            key="lifecycle"
-            gi="lifecycle">
+             as-type="token"
+             name="lifecycle"
+             key="lifecycle"
+             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/response/required-asset/@uuid" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/response/required-asset/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 priority="10"><!-- XML match="assessment-results/result/risk/risk-log/entry/@uuid" -->
+                  priority="10"><!-- XML match="assessment-results/result/risk/risk-log/entry/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid']"
-                 priority="12"><!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid" -->
+                  priority="12"><!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="response-uuid"
-            key="response-uuid"
-            gi="response-uuid">
+             as-type="uuid"
+             name="response-uuid"
+             key="response-uuid"
+             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/related-observation/@observation-uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="finding/@uuid" -->
+                  priority="1"><!-- XML match="finding/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='target']/j:string[@key='type']" priority="1"><!-- XML match="target/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='target']/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='target']/j:string[@key='target-id']" priority="1"><!-- XML match="target/@target-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="target-id"
-            key="target-id"
-            gi="target-id">
+             as-type="token"
+             name="target-id"
+             key="target-id"
+             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='target']/j:string[@key='target-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/target/status/@state" -->
+                  priority="9"><!-- XML match="assessment-results/result/finding/target/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/target/status/@reason" -->
+                  priority="9"><!-- XML match="assessment-results/result/finding/target/status/@reason" -->
       <flag in-json="string"
-            as-type="token"
-            name="reason"
-            key="reason"
-            gi="reason">
+             as-type="token"
+             name="reason"
+             key="reason"
+             gi="reason">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
-                 priority="1"><!-- XML match="implementation-status/@state" -->
+                  priority="1"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/related-observation/@observation-uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/finding/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/associated-risk/@risk-uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/finding/associated-risk/@risk-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="assessment-results/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="assessment-results/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="assessment-results/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="assessment-results/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="assessment-results/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="assessment-results/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="assessment-results/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="assessment-results/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2106,22 +2169,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -2129,22 +2192,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2152,22 +2215,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2175,22 +2238,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2198,14 +2261,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -2220,14 +2283,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -2235,15 +2298,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2251,22 +2314,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -2274,22 +2337,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -2297,22 +2360,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -2320,22 +2383,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -2343,22 +2406,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2366,41 +2429,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-results/metadata/document-id-->
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2408,22 +2471,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2431,22 +2508,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2454,23 +2531,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2478,22 +2555,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2501,22 +2578,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2524,14 +2617,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -2547,34 +2640,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2582,22 +2675,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2605,22 +2698,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2628,22 +2721,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2651,79 +2744,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-results/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2731,22 +2825,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2754,22 +2868,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2777,41 +2891,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-results/metadata/party/external-id-->
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2819,52 +2933,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-results/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -2877,34 +2991,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2912,22 +3026,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2935,22 +3049,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2958,22 +3072,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2981,41 +3095,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3023,19 +3137,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']"
-                 priority="3">
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions" -->
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -3045,16 +3205,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3062,22 +3222,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3085,22 +3245,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3108,46 +3268,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for assessment-results/local-definitions/objectives-and-methods//part-->
    <xsl:template priority="4"
-                 match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3155,22 +3315,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3178,23 +3338,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3202,22 +3362,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3225,14 +3385,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step" -->
       <assembly name="step" gi="step">
@@ -3247,15 +3407,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3263,23 +3423,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3287,22 +3447,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3310,23 +3470,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3334,22 +3494,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3357,14 +3517,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection" -->
       <assembly name="control-selection" gi="control-selection">
@@ -3378,16 +3538,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3395,22 +3555,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3418,14 +3578,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
       <assembly name="select-control-by-id" gi="include-control">
@@ -3434,26 +3594,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
       <assembly name="select-control-by-id" gi="exclude-control">
@@ -3462,26 +3622,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
       <assembly name="control-objective-selection" gi="control-objective-selection">
@@ -3495,16 +3655,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3512,22 +3672,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3535,22 +3695,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/step/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3558,23 +3718,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3582,22 +3742,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3605,14 +3765,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection" -->
       <assembly name="control-selection" gi="control-selection">
@@ -3626,16 +3786,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3643,22 +3803,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3666,14 +3826,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control" -->
       <assembly name="select-control-by-id" gi="include-control">
@@ -3682,26 +3842,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control" -->
       <assembly name="select-control-by-id" gi="exclude-control">
@@ -3710,26 +3870,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection" -->
       <assembly name="control-objective-selection" gi="control-objective-selection">
@@ -3743,16 +3903,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3760,22 +3920,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3783,22 +3943,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/local-definitions/activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3806,22 +3966,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3829,23 +3989,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3853,22 +4013,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='start']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/start" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -3876,22 +4036,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='end']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/end" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -3899,22 +4059,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3922,19 +4082,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions" -->
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
@@ -3946,15 +4106,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3962,23 +4122,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3986,22 +4146,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -4009,22 +4169,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4032,14 +4192,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/status" -->
       <assembly name="status" key="status" gi="status">
@@ -4051,15 +4211,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4067,22 +4227,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4090,23 +4250,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4114,22 +4274,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4137,22 +4297,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4160,14 +4320,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component" -->
       <assembly name="implemented-component" gi="implemented-component">
@@ -4179,15 +4339,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4195,22 +4355,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4218,22 +4378,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4241,22 +4401,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -4264,23 +4424,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4288,22 +4448,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4311,22 +4471,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4334,23 +4494,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4358,22 +4518,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4381,23 +4541,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4405,22 +4565,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -4428,22 +4588,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4451,14 +4611,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/status" -->
       <assembly name="status" key="status" gi="status">
@@ -4470,15 +4630,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4486,22 +4646,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4509,14 +4669,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform" -->
       <assembly name="assessment-platform" gi="assessment-platform">
@@ -4529,15 +4689,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4545,22 +4705,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4568,14 +4728,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component" -->
       <assembly name="uses-component" gi="uses-component">
@@ -4587,15 +4747,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4603,22 +4763,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4626,22 +4786,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4649,23 +4809,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4673,22 +4833,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4696,14 +4856,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing" -->
       <assembly name="timing" key="timing" gi="timing">
@@ -4716,7 +4876,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date" -->
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
@@ -4727,13 +4887,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range" -->
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -4742,13 +4902,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency" -->
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -4757,7 +4917,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency" -->
       <assembly name="dependency" gi="dependency">
@@ -4766,7 +4926,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity" -->
       <assembly name="associated-activity" gi="associated-activity">
@@ -4779,15 +4939,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4795,22 +4955,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4818,23 +4978,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4842,22 +5002,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4865,22 +5025,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4888,22 +5048,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4911,23 +5071,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4935,22 +5095,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4958,22 +5118,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4981,22 +5141,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5004,22 +5164,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5027,23 +5187,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5051,22 +5211,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5074,14 +5234,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection" -->
       <assembly name="control-selection" gi="control-selection">
@@ -5095,16 +5255,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5112,22 +5272,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5135,14 +5295,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control" -->
       <assembly name="select-control-by-id" gi="include-control">
@@ -5151,26 +5311,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control" -->
       <assembly name="select-control-by-id" gi="exclude-control">
@@ -5179,26 +5339,26 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection" -->
       <assembly name="control-objective-selection" gi="control-objective-selection">
@@ -5212,16 +5372,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5229,22 +5389,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5252,14 +5412,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation" -->
       <assembly name="attestation" gi="attestation">
@@ -5268,15 +5428,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5284,22 +5444,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5307,46 +5467,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for assessment-results/result/attestation//part-->
    <xsl:template priority="4"
-                 match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/attestation//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5354,14 +5514,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log" -->
       <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
@@ -5372,7 +5532,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry" -->
       <assembly name="entry" gi="entry">
@@ -5389,15 +5549,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5405,23 +5565,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5429,22 +5589,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/start" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -5452,22 +5612,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/end" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -5475,22 +5635,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5498,22 +5658,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5521,22 +5681,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5544,23 +5704,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5568,22 +5728,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5591,22 +5751,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5614,22 +5774,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5637,19 +5797,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -5658,16 +5818,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5675,22 +5835,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5698,22 +5858,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5721,22 +5881,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5744,22 +5904,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5767,23 +5927,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5791,22 +5951,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5814,60 +5974,60 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/method" -->
       <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/type" -->
       <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5875,22 +6035,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5898,22 +6058,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5921,23 +6081,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5945,22 +6105,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5968,22 +6128,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5991,22 +6151,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6014,19 +6174,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -6035,16 +6195,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6052,22 +6212,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6075,22 +6235,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6098,22 +6258,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6121,14 +6281,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject" -->
       <assembly name="subject-reference" gi="subject">
@@ -6141,15 +6301,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6157,22 +6317,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6180,14 +6340,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence" -->
       <assembly name="relevant-evidence" gi="relevant-evidence">
@@ -6199,16 +6359,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6216,22 +6376,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/relevant-evidence/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6239,22 +6399,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/collected" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
@@ -6262,22 +6422,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/observation/expires" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expires</xsl:attribute>
          </xsl:if>
@@ -6285,22 +6445,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -6308,23 +6468,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6332,23 +6492,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/statement" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
@@ -6356,22 +6516,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6379,22 +6539,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6402,22 +6562,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6425,22 +6585,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6448,23 +6608,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6472,22 +6632,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6495,22 +6655,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6518,22 +6678,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6541,19 +6701,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -6562,16 +6722,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6579,22 +6739,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6602,22 +6762,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6625,22 +6785,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6648,22 +6808,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6671,22 +6831,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6694,22 +6854,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6717,22 +6877,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6740,23 +6900,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6764,22 +6924,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6787,22 +6947,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6810,22 +6970,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6833,19 +6993,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -6854,16 +7014,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -6871,22 +7031,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6894,22 +7054,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6917,22 +7077,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6940,14 +7100,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/facet" -->
       <assembly name="facet" gi="facet">
@@ -6960,15 +7120,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/characterization/facet/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -6976,14 +7136,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor" -->
       <assembly name="mitigating-factor" gi="mitigating-factor">
@@ -6996,16 +7156,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7013,22 +7173,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7036,14 +7196,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject" -->
       <assembly name="subject-reference" gi="subject">
@@ -7056,15 +7216,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7072,22 +7232,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7095,22 +7255,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/deadline" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">deadline</xsl:attribute>
          </xsl:if>
@@ -7118,14 +7278,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response" -->
       <assembly name="response" gi="response">
@@ -7142,15 +7302,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7158,23 +7318,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7182,22 +7342,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7205,22 +7365,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7228,22 +7388,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7251,22 +7411,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7274,23 +7434,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7298,22 +7458,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7321,22 +7481,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7344,22 +7504,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7367,19 +7527,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -7388,16 +7548,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7405,22 +7565,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7428,22 +7588,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="21">
+                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7451,22 +7611,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="21">
+                  mode="get-value-property"
+                  priority="21">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7474,14 +7634,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset" -->
       <assembly name="required-asset" gi="required-asset">
@@ -7495,7 +7655,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject" -->
       <assembly name="subject-reference" gi="subject">
@@ -7508,15 +7668,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7524,22 +7684,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7547,22 +7707,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7570,23 +7730,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7594,22 +7754,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response/required-asset/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7617,22 +7777,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -7640,23 +7800,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7664,22 +7824,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7687,14 +7847,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing" -->
       <assembly name="timing" key="timing" gi="timing">
@@ -7707,7 +7867,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/on-date" -->
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
@@ -7718,13 +7878,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -7733,13 +7893,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -7748,7 +7908,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/dependency" -->
       <assembly name="dependency" gi="dependency">
@@ -7757,7 +7917,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity" -->
       <assembly name="associated-activity" gi="associated-activity">
@@ -7770,15 +7930,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7786,22 +7946,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7809,23 +7969,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7833,22 +7993,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7856,22 +8016,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7879,22 +8039,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7902,23 +8062,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -7926,22 +8086,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7949,22 +8109,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7972,22 +8132,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -7995,22 +8155,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/response//task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8018,14 +8178,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log" -->
       <assembly name="risk-log" key="risk-log" gi="risk-log">
@@ -8036,7 +8196,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry" -->
       <assembly name="entry" gi="entry">
@@ -8054,15 +8214,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8070,23 +8230,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8094,22 +8254,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/start" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -8117,22 +8277,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/end" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -8140,22 +8300,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8163,14 +8323,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response" -->
       <assembly name="related-response" gi="related-response">
@@ -8182,15 +8342,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8198,22 +8358,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8221,22 +8381,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8244,23 +8404,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8268,22 +8428,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8291,22 +8451,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="21">
+                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8314,22 +8474,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="21">
+                  mode="get-value-property"
+                  priority="21">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8337,19 +8497,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -8358,16 +8518,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8375,22 +8535,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8398,22 +8558,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="22">
+                  priority="22">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8421,22 +8581,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="22">
+                  mode="get-value-property"
+                  priority="22">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="21">
+                  priority="21">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8444,14 +8604,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="21">
+                  mode="get-value-property"
+                  priority="21">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/risk/related-observation" -->
       <assembly as-type="empty" name="related-observation" gi="related-observation">
@@ -8459,15 +8619,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8475,23 +8635,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8499,22 +8659,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8522,22 +8682,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8545,22 +8705,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8568,22 +8728,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8591,23 +8751,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8615,22 +8775,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8638,22 +8798,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8661,22 +8821,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8684,19 +8844,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -8705,16 +8865,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8722,22 +8882,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8745,22 +8905,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8768,22 +8928,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8791,22 +8951,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8814,23 +8974,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8838,22 +8998,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -8861,14 +9021,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/target/status" -->
       <assembly name="status" key="status" gi="status">
@@ -8881,15 +9041,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/implementation-statement-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="implementation-statement-uuid"
-             key="implementation-statement-uuid"
-             gi="implementation-statement-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
          </xsl:if>
@@ -8897,14 +9057,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/related-observation" -->
       <assembly as-type="empty" name="related-observation" gi="related-observation">
@@ -8912,7 +9072,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/result/finding/associated-risk" -->
       <assembly as-type="empty" name="associated-risk" gi="associated-risk">
@@ -8920,7 +9080,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -8936,15 +9096,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -8952,23 +9112,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -8976,33 +9136,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching assessment-results/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -9015,15 +9175,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9031,22 +9191,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -9054,14 +9214,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -9071,14 +9231,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -9089,7 +9249,7 @@
    </xsl:template>
    <!-- matching assessment-results/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -9103,8 +9263,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -9114,8 +9274,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -9144,15 +9304,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -9183,9 +9343,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -9223,8 +9383,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -9235,7 +9395,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -9254,9 +9414,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -9270,7 +9430,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -9284,9 +9444,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -9465,40 +9625,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_catalog_json-to-xml-converter.xsl b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
index 6119eda09c..4937757112 100644
--- a/xml/convert/oscal_catalog_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_catalog_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -126,6 +126,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -138,6 +139,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -148,64 +150,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -264,6 +234,7 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='parts']"/>
+         <xsl:apply-templates select="*[@key='mapping']"/>
          <xsl:apply-templates select="*[@key='controls']"/>
       </assembly>
    </xsl:template>
@@ -282,6 +253,57 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="target-resource" -->
+      <assembly name="mapping-resource-reference"
+                 key="target-resource"
+                 gi="target-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="map" -->
+      <assembly name="map" gi="map">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='relationship']"/>
+         <xsl:apply-templates select="*[@key='sources']"/>
+         <xsl:apply-templates select="*[@key='targets']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="source" -->
+      <assembly name="mapping-item" gi="source">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='id-ref']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='targets']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="target" -->
+      <assembly name="mapping-item" gi="target">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='id-ref']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="group" -->
@@ -311,12 +333,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -324,8 +346,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -334,16 +356,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -352,16 +374,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='party-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -370,16 +392,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="value" -->
       <field collapsible="no"
-             as-type="string"
-             name="parameter-value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="parameter-value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -400,434 +422,613 @@
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:string[@key='uuid']" priority="1"><!-- XML match="catalog/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="catalog/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="catalog/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="catalog/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="catalog/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']" priority="1"><!-- XML match="param/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="param/@class" -->
+                  priority="1"><!-- XML match="param/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"
-                 priority="1"><!-- XML match="param/@depends-on" -->
+                  priority="1"><!-- XML match="param/@depends-on" -->
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']" priority="1"><!-- XML match="select/@how-many" -->
       <flag in-json="string"
-            as-type="token"
-            name="how-many"
-            key="how-many"
-            gi="how-many">
+             as-type="token"
+             name="how-many"
+             key="how-many"
+             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='id']" priority="1"><!-- XML match="control/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="control/@class" -->
+                  priority="1"><!-- XML match="control/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']" priority="1"><!-- XML match="part/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog//control/mapping/@uuid | catalog//group//control/mapping/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='type']"
+                  priority="1"><!-- XML match="target-resource/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='href']"
+                  priority="1"><!-- XML match="target-resource/@href" -->
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='href']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="map/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns']"
+                  priority="9"><!-- XML match="catalog//control/mapping/map/relationship/@ns | catalog//group//control/mapping/map/relationship/@ns" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='type'] | j:array[@key='targets']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="source/@type | target/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='type'] | j:array[@key='targets']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='id-ref'] | j:array[@key='targets']/j:map/j:string[@key='id-ref']"
+                  priority="1"><!-- XML match="source/@id-ref | target/@id-ref" -->
+      <flag in-json="string"
+             as-type="string"
+             name="id-ref"
+             key="id-ref"
+             gi="id-ref">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='id-ref'] | j:array[@key='targets']/j:map/j:string[@key='id-ref']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']" priority="1"><!-- XML match="group/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="group/@class" -->
+                  priority="1"><!-- XML match="group/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="catalog/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="catalog/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="catalog/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="catalog/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="catalog/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="catalog/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -835,22 +1036,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -858,22 +1059,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -881,22 +1082,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -904,22 +1105,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -927,14 +1128,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -949,14 +1150,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -964,15 +1165,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -980,22 +1181,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1003,22 +1204,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1026,22 +1227,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1049,22 +1250,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1072,22 +1273,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1095,41 +1296,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/document-id-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1137,22 +1338,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1160,22 +1375,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1183,23 +1398,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1207,22 +1422,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1230,22 +1445,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1253,14 +1484,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -1276,34 +1507,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1311,22 +1542,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1334,22 +1565,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1357,22 +1588,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1380,79 +1611,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1460,22 +1692,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -1483,22 +1735,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1506,41 +1758,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/party/external-id-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1548,52 +1800,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -1606,34 +1858,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1641,22 +1893,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1664,22 +1916,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1687,22 +1939,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1710,41 +1962,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1752,22 +2004,68 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1775,22 +2073,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -1798,23 +2096,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -1822,23 +2120,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1846,14 +2144,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -1862,15 +2160,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -1878,65 +2176,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog/param/guideline-->
    <xsl:template priority="3"
-                 match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1944,22 +2242,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1967,22 +2265,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -1990,23 +2288,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -2014,23 +2312,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2038,14 +2336,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -2054,15 +2352,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2070,65 +2368,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//control/param/guideline-->
    <xsl:template priority="4"
-                 match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2136,22 +2434,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2159,46 +2457,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//control//part-->
    <xsl:template priority="3"
-                 match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2206,22 +2504,150 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping" -->
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='target-resource']"/>
+         <xsl:apply-templates select="*[@key='maps']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/target-resource/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/relationship" -->
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='ns']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching catalog//control/mapping/map/relationship-->
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  mode="get-value-property">
+      <value as-type="token" key="type" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/source/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2229,22 +2655,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2252,22 +2678,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2275,23 +2701,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -2299,23 +2725,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2323,14 +2749,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -2339,15 +2765,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2355,65 +2781,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group/param/guideline-->
    <xsl:template priority="4"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2421,22 +2847,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2444,46 +2870,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group//part-->
    <xsl:template priority="3"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2491,22 +2917,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2514,22 +2940,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2537,22 +2963,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2560,23 +2986,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -2584,23 +3010,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2608,14 +3034,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -2624,15 +3050,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2640,65 +3066,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group//control/param/guideline-->
    <xsl:template priority="5"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2706,22 +3132,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2729,46 +3155,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group//control//part-->
    <xsl:template priority="4"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2776,14 +3202,142 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping" -->
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='target-resource']"/>
+         <xsl:apply-templates select="*[@key='maps']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/target-resource/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/relationship" -->
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='ns']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching catalog//group//control/mapping/map/relationship-->
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  mode="get-value-property">
+      <value as-type="token" key="type" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/source/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -2799,15 +3353,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2815,23 +3369,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2839,33 +3393,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -2878,15 +3432,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2894,22 +3448,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2917,14 +3471,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -2934,14 +3488,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -2952,7 +3506,7 @@
    </xsl:template>
    <!-- matching catalog/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -2966,8 +3520,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -2977,8 +3531,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -3007,15 +3561,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -3046,9 +3600,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -3086,8 +3640,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -3098,7 +3652,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -3117,9 +3671,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -3133,7 +3687,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -3147,9 +3701,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -3328,40 +3882,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_complete_json-to-xml-converter.xsl b/xml/convert/oscal_complete_json-to-xml-converter.xsl
index a930789379..3f9981414f 100644
--- a/xml/convert/oscal_complete_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_complete_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -126,6 +126,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -138,6 +139,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -148,64 +150,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -264,6 +234,7 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='parts']"/>
+         <xsl:apply-templates select="*[@key='mapping']"/>
          <xsl:apply-templates select="*[@key='controls']"/>
       </assembly>
    </xsl:template>
@@ -297,6 +268,75 @@
          <xsl:apply-templates select="*[@key='links']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="target-resource" -->
+      <assembly name="mapping-resource-reference"
+                 key="target-resource"
+                 gi="target-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="map" -->
+      <assembly name="map" gi="map">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='relationship']"/>
+         <xsl:apply-templates select="*[@key='sources']"/>
+         <xsl:apply-templates select="*[@key='targets']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="source" -->
+      <assembly name="mapping-item" gi="source">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='id-ref']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:array[@key='targets']/j:map | j:array[@key='maps']/j:map/j:array[@key='targets']/j:map | j:array[@key='maps']/j:map/j:array[@key='targets']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="map/target | map/target | map/target" -->
+      <assembly name="mapping-item" gi="target">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='id-ref']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='findings']/j:map/j:map[@key='target'] | j:array[@key='findings']/j:map/j:map[@key='target']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="finding/target | finding/target" -->
+      <assembly name="finding-target" key="target" gi="target">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='target-id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='status']"/>
+         <xsl:apply-templates select="*[@key='implementation-status']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='groups']/j:map | j:map[@key='catalog']/j:array[@key='groups']/j:map//j:array[@key='groups']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/group | catalog/group//group" -->
@@ -337,6 +377,53 @@
          <xsl:apply-templates select="*[@key='resources']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection" -->
+      <assembly name="mapping-collection"
+                 key="mapping-collection"
+                 gi="mapping-collection">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping-collection</xsl:attribute>
+         </xsl:if>
+         <xsl:if test=".. is /j:map">
+            <xsl:attribute name="namespace">http://csrc.nist.gov/ns/oscal/1.0</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='metadata']"/>
+         <xsl:apply-templates select="*[@key='mappings']"/>
+         <xsl:apply-templates select="*[@key='back-matter']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="(j:map[@key='mapping'] | (j:array[@key='mappings']/j:map | j:map[@key='mappings']))">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping" -->
+      <assembly name="mapping" gi="mapping" key="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='source-resource']"/>
+         <xsl:apply-templates select="*[@key='target-resource']"/>
+         <xsl:apply-templates select="*[@key='maps']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='source-resource']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="source-resource" -->
+      <assembly name="mapping-resource-reference"
+                 key="source-resource"
+                 gi="source-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">source-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='profile']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile" -->
@@ -369,14 +456,21 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:array[@key='matching']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="matching" -->
+      <assembly as-type="empty" name="matching" gi="matching">
+         <xsl:apply-templates select="*[@key='pattern']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='merge']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="merge" -->
@@ -411,45 +505,12 @@
          <xsl:apply-templates select="*[@key='alters']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='alters']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="alter" -->
-      <assembly name="alter" gi="alter">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='removes']"/>
-         <xsl:apply-templates select="*[@key='adds']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="remove" -->
-      <assembly as-type="empty" name="remove" gi="remove">
-         <xsl:apply-templates select="*[@key='by-name']"/>
-         <xsl:apply-templates select="*[@key='by-class']"/>
-         <xsl:apply-templates select="*[@key='by-id']"/>
-         <xsl:apply-templates select="*[@key='by-item-name']"/>
-         <xsl:apply-templates select="*[@key='by-ns']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="add" -->
-      <assembly name="add" gi="add">
-         <xsl:apply-templates select="*[@key='position']"/>
-         <xsl:apply-templates select="*[@key='by-id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='params']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='parts']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='component-definition']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition" -->
       <assembly name="component-definition"
-                key="component-definition"
-                gi="component-definition">
+                 key="component-definition"
+                 gi="component-definition">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
          </xsl:if>
@@ -468,8 +529,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-component-definition" -->
       <assembly as-type="empty"
-                name="import-component-definition"
-                gi="import-component-definition">
+                 name="import-component-definition"
+                 gi="import-component-definition">
          <xsl:apply-templates select="*[@key='href']"/>
       </assembly>
    </xsl:template>
@@ -490,9 +551,9 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-implementation']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map">
+   <xsl:template match="j:map[@key='system-implementation']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map | j:map[@key='local-definitions']/j:array[@key='components']/j:map | j:map[@key='assessment-assets']/j:array[@key='components']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-implementation/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component | local-definitions/component" -->
+      <!-- XML match="system-implementation/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component | local-definitions/component | assessment-assets/component" -->
       <assembly name="system-component" gi="component">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
@@ -572,8 +633,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan" -->
       <assembly name="system-security-plan"
-                key="system-security-plan"
-                gi="system-security-plan">
+                 key="system-security-plan"
+                 gi="system-security-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
          </xsl:if>
@@ -604,8 +665,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-characteristics" -->
       <assembly name="system-characteristics"
-                key="system-characteristics"
-                gi="system-characteristics">
+                 key="system-characteristics"
+                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
          </xsl:if>
@@ -631,8 +692,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-information" -->
       <assembly name="system-information"
-                key="system-information"
-                gi="system-information">
+                 key="system-information"
+                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
          </xsl:if>
@@ -641,12 +702,56 @@
          <xsl:apply-templates select="*[@key='information-types']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='confidentiality-impact']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="confidentiality-impact" -->
+      <assembly name="impact"
+                 key="confidentiality-impact"
+                 gi="confidentiality-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='base']"/>
+         <xsl:apply-templates select="*[@key='selected']"/>
+         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='integrity-impact']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="integrity-impact" -->
+      <assembly name="impact" key="integrity-impact" gi="integrity-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">integrity-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='base']"/>
+         <xsl:apply-templates select="*[@key='selected']"/>
+         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='availability-impact']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="availability-impact" -->
+      <assembly name="impact" key="availability-impact" gi="availability-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">availability-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='base']"/>
+         <xsl:apply-templates select="*[@key='selected']"/>
+         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='security-impact-level']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="security-impact-level" -->
       <assembly name="security-impact-level"
-                key="security-impact-level"
-                gi="security-impact-level">
+                 key="security-impact-level"
+                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
          </xsl:if>
@@ -659,8 +764,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorization-boundary" -->
       <assembly name="authorization-boundary"
-                key="authorization-boundary"
-                gi="authorization-boundary">
+                 key="authorization-boundary"
+                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
          </xsl:if>
@@ -687,8 +792,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="network-architecture" -->
       <assembly name="network-architecture"
-                key="network-architecture"
-                gi="network-architecture">
+                 key="network-architecture"
+                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
          </xsl:if>
@@ -717,8 +822,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-implementation" -->
       <assembly name="system-implementation"
-                key="system-implementation"
-                gi="system-implementation">
+                 key="system-implementation"
+                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
          </xsl:if>
@@ -790,8 +895,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="implementation-status" -->
       <assembly name="implementation-status"
-                key="implementation-status"
-                gi="implementation-status">
+                 key="implementation-status"
+                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
          </xsl:if>
@@ -863,8 +968,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="reviewed-controls" -->
       <assembly name="reviewed-controls"
-                key="reviewed-controls"
-                gi="reviewed-controls">
+                 key="reviewed-controls"
+                 gi="reviewed-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">reviewed-controls</xsl:attribute>
          </xsl:if>
@@ -880,8 +985,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-objective" -->
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="include-objective">
+                 name="select-objective-by-id"
+                 gi="include-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
    </xsl:template>
@@ -889,8 +994,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="exclude-objective" -->
       <assembly as-type="empty"
-                name="select-objective-by-id"
-                gi="exclude-objective">
+                 name="select-objective-by-id"
+                 gi="exclude-objective">
          <xsl:apply-templates select="*[@key='objective-id']"/>
       </assembly>
    </xsl:template>
@@ -898,8 +1003,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="related-controls" -->
       <assembly name="reviewed-controls"
-                key="related-controls"
-                gi="related-controls">
+                 key="related-controls"
+                 gi="related-controls">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">related-controls</xsl:attribute>
          </xsl:if>
@@ -951,8 +1056,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-assets" -->
       <assembly name="assessment-assets"
-                key="assessment-assets"
-                gi="assessment-assets">
+                 key="assessment-assets"
+                 gi="assessment-assets">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-assets</xsl:attribute>
          </xsl:if>
@@ -997,8 +1102,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="assessment-results" -->
       <assembly name="assessment-results"
-                key="assessment-results"
-                gi="assessment-results">
+                 key="assessment-results"
+                 gi="assessment-results">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">assessment-results</xsl:attribute>
          </xsl:if>
@@ -1174,30 +1279,12 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='target']">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="target" -->
-      <assembly name="finding-target" key="target" gi="target">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">target</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='target-id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='status']"/>
-         <xsl:apply-templates select="*[@key='implementation-status']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones" -->
       <assembly name="plan-of-action-and-milestones"
-                key="plan-of-action-and-milestones"
-                gi="plan-of-action-and-milestones">
+                 key="plan-of-action-and-milestones"
+                 gi="plan-of-action-and-milestones">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
          </xsl:if>
@@ -1211,6 +1298,7 @@
          <xsl:apply-templates select="*[@key='local-definitions']"/>
          <xsl:apply-templates select="*[@key='observations']"/>
          <xsl:apply-templates select="*[@key='risks']"/>
+         <xsl:apply-templates select="*[@key='findings']"/>
          <xsl:apply-templates select="*[@key='poam-items']"/>
          <xsl:apply-templates select="*[@key='back-matter']"/>
       </assembly>
@@ -1219,13 +1307,14 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="local-definitions" -->
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="*[@key='components']"/>
          <xsl:apply-templates select="*[@key='inventory-items']"/>
+         <xsl:apply-templates select="*[@key='assessment-assets']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -1239,6 +1328,7 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='origins']"/>
+         <xsl:apply-templates select="*[@key='related-findings']"/>
          <xsl:apply-templates select="*[@key='related-observations']"/>
          <xsl:apply-templates select="*[@key='related-risks']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
@@ -1248,12 +1338,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -1261,8 +1351,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1271,16 +1361,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1289,16 +1379,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="(j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'])"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1307,16 +1397,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="value" -->
       <field collapsible="no"
-             as-type="string"
-             name="parameter-value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="parameter-value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1335,13 +1425,31 @@
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
+   <xsl:template match="j:array[@key='with-ids']/j:string">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="with-id" -->
+      <field collapsible="no"
+              as-type="token"
+              name="with-id"
+              gi="with-id"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:array[@key='with-ids']/j:string"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
    <xsl:template match="(j:array[@key='system-ids']/j:map | j:map[@key='system-id'])">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-id"
-             gi="system-id">
+              as-type="string"
+              name="system-id"
+              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
          </xsl:if>
@@ -1351,7 +1459,7 @@
    </xsl:template>
    <!-- matching system-id-->
    <xsl:template match="(j:array[@key='system-ids']/j:map | j:map[@key='system-id'])"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -1360,16 +1468,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='role-ids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1378,16 +1486,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='functions-performed']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1396,11 +1504,11 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status" -->
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status"
-             gi="status"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status"
+              gi="status"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -1408,8 +1516,8 @@
       </field>
    </xsl:template>
    <xsl:template match="(j:map[@key='status'] | j:string[@key='status'])"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -1433,11 +1541,11 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status-change" -->
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status-change"
-             gi="status-change"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status-change"
+              gi="status-change"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
@@ -1445,2115 +1553,2343 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='status-change']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:string[@key='uuid']" priority="1"><!-- XML match="catalog/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme | profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme | component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme | system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme | assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme | assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme | plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
+                  priority="6"><!-- XML match="catalog/metadata/document-id/@scheme | catalog/back-matter/resource/document-id/@scheme | mapping-collection/metadata/document-id/@scheme | mapping-collection/back-matter/resource/document-id/@scheme | profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme | component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme | system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme | assessment-plan/metadata/document-id/@scheme | assessment-plan/back-matter/resource/document-id/@scheme | assessment-results/metadata/document-id/@scheme | assessment-results/back-matter/resource/document-id/@scheme | plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="catalog/metadata/role/@id | mapping-collection/metadata/role/@id | profile/metadata/role/@id | component-definition/metadata/role/@id | system-security-plan/metadata/role/@id | assessment-plan/metadata/role/@id | assessment-results/metadata/role/@id | plan-of-action-and-milestones/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog/metadata/location/@uuid | mapping-collection/metadata/location/@uuid | profile/metadata/location/@uuid | component-definition/metadata/location/@uuid | system-security-plan/metadata/location/@uuid | assessment-plan/metadata/location/@uuid | assessment-results/metadata/location/@uuid | plan-of-action-and-milestones/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type | profile/metadata/location/address/@type | profile/metadata/party/address/@type | component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type | system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type | assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type | assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type | plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="catalog/metadata/location/address/@type | catalog/metadata/party/address/@type | mapping-collection/metadata/location/address/@type | mapping-collection/metadata/party/address/@type | profile/metadata/location/address/@type | profile/metadata/party/address/@type | component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type | system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type | assessment-plan/metadata/location/address/@type | assessment-plan/metadata/party/address/@type | assessment-results/metadata/location/address/@type | assessment-results/metadata/party/address/@type | plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type | profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type | component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type | system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type | assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type | assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type | plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
+                  priority="8"><!-- XML match="catalog/metadata/location/telephone-number/@type | catalog/metadata/party/telephone-number/@type | mapping-collection/metadata/location/telephone-number/@type | mapping-collection/metadata/party/telephone-number/@type | profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type | component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type | system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type | assessment-plan/metadata/location/telephone-number/@type | assessment-plan/metadata/party/telephone-number/@type | assessment-results/metadata/location/telephone-number/@type | assessment-results/metadata/party/telephone-number/@type | plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog/metadata/party/@uuid | mapping-collection/metadata/party/@uuid | profile/metadata/party/@uuid | component-definition/metadata/party/@uuid | system-security-plan/metadata/party/@uuid | assessment-plan/metadata/party/@uuid | assessment-results/metadata/party/@uuid | plan-of-action-and-milestones/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="catalog/metadata/party/@type | mapping-collection/metadata/party/@type | profile/metadata/party/@type | component-definition/metadata/party/@type | system-security-plan/metadata/party/@type | assessment-plan/metadata/party/@type | assessment-results/metadata/party/@type | plan-of-action-and-milestones/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="catalog/metadata/party/external-id/@scheme | profile/metadata/party/external-id/@scheme | component-definition/metadata/party/external-id/@scheme | system-security-plan/metadata/party/external-id/@scheme | assessment-plan/metadata/party/external-id/@scheme | assessment-results/metadata/party/external-id/@scheme | plan-of-action-and-milestones/metadata/party/external-id/@scheme" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
+                  priority="8"><!-- XML match="catalog/metadata/party/external-id/@scheme | mapping-collection/metadata/party/external-id/@scheme | profile/metadata/party/external-id/@scheme | component-definition/metadata/party/external-id/@scheme | system-security-plan/metadata/party/external-id/@scheme | assessment-plan/metadata/party/external-id/@scheme | assessment-results/metadata/party/external-id/@scheme | plan-of-action-and-milestones/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']" priority="1"><!-- XML match="param/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="param/@class" -->
+                  priority="1"><!-- XML match="param/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"
-                 priority="1"><!-- XML match="param/@depends-on" -->
+                  priority="1"><!-- XML match="param/@depends-on" -->
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']" priority="1"><!-- XML match="select/@how-many" -->
       <flag in-json="string"
-            as-type="token"
-            name="how-many"
-            key="how-many"
-            gi="how-many">
+             as-type="token"
+             name="how-many"
+             key="how-many"
+             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='id']" priority="1"><!-- XML match="control/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="control/@class" -->
+                  priority="1"><!-- XML match="control/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='controls']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']" priority="1"><!-- XML match="part/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog//control/mapping/@uuid | catalog//group//control/mapping/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='type'] | j:map[@key='source-resource']/j:string[@key='type']"
+                  priority="1"><!-- XML match="target-resource/@type | source-resource/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='type'] | j:map[@key='source-resource']/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='href'] | j:map[@key='source-resource']/j:string[@key='href']"
+                  priority="1"><!-- XML match="target-resource/@href | source-resource/@href" -->
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']/j:string[@key='href'] | j:map[@key='source-resource']/j:string[@key='href']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="map/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns'] | j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns']"
+                  priority="9"><!-- XML match="catalog//control/mapping/map/relationship/@ns | catalog//group//control/mapping/map/relationship/@ns | mapping-collection/mapping/map/relationship/@ns" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns'] | j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns'] | j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='type'] | (j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='type']"
+                  priority="1"><!-- XML match="source/@type | target/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='type'] | (j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='id-ref'] | (j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='id-ref']"
+                  priority="1"><!-- XML match="source/@id-ref | target/@id-ref" -->
+      <flag in-json="string"
+             as-type="string"
+             name="id-ref"
+             key="id-ref"
+             gi="id-ref">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='id-ref'] | (j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='id-ref']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']" priority="1"><!-- XML match="group/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="group/@class" -->
+                  priority="1"><!-- XML match="group/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="catalog/back-matter/resource/@uuid | profile/back-matter/resource/@uuid | component-definition/back-matter/resource/@uuid | system-security-plan/back-matter/resource/@uuid | assessment-plan/back-matter/resource/@uuid | assessment-results/back-matter/resource/@uuid | plan-of-action-and-milestones/back-matter/resource/@uuid" -->
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="catalog/back-matter/resource/@uuid | mapping-collection/back-matter/resource/@uuid | profile/back-matter/resource/@uuid | component-definition/back-matter/resource/@uuid | system-security-plan/back-matter/resource/@uuid | assessment-plan/back-matter/resource/@uuid | assessment-results/back-matter/resource/@uuid | plan-of-action-and-milestones/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="catalog/back-matter/resource/rlink/@href | profile/back-matter/resource/rlink/@href | component-definition/back-matter/resource/rlink/@href | system-security-plan/back-matter/resource/rlink/@href | assessment-plan/back-matter/resource/rlink/@href | assessment-results/back-matter/resource/rlink/@href | plan-of-action-and-milestones/back-matter/resource/rlink/@href" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
+                  priority="8"><!-- XML match="catalog/back-matter/resource/rlink/@href | mapping-collection/back-matter/resource/rlink/@href | profile/back-matter/resource/rlink/@href | component-definition/back-matter/resource/rlink/@href | system-security-plan/back-matter/resource/rlink/@href | assessment-plan/back-matter/resource/rlink/@href | assessment-results/back-matter/resource/rlink/@href | plan-of-action-and-milestones/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/rlink/@media-type | profile/back-matter/resource/rlink/@media-type | component-definition/back-matter/resource/rlink/@media-type | system-security-plan/back-matter/resource/rlink/@media-type | assessment-plan/back-matter/resource/rlink/@media-type | assessment-results/back-matter/resource/rlink/@media-type | plan-of-action-and-milestones/back-matter/resource/rlink/@media-type" -->
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/rlink/@media-type | mapping-collection/back-matter/resource/rlink/@media-type | profile/back-matter/resource/rlink/@media-type | component-definition/back-matter/resource/rlink/@media-type | system-security-plan/back-matter/resource/rlink/@media-type | assessment-plan/back-matter/resource/rlink/@media-type | assessment-results/back-matter/resource/rlink/@media-type | plan-of-action-and-milestones/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="catalog/back-matter/resource/base64/@filename | profile/back-matter/resource/base64/@filename | component-definition/back-matter/resource/base64/@filename | system-security-plan/back-matter/resource/base64/@filename | assessment-plan/back-matter/resource/base64/@filename | assessment-results/back-matter/resource/base64/@filename | plan-of-action-and-milestones/back-matter/resource/base64/@filename" -->
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
+                  priority="7"><!-- XML match="catalog/back-matter/resource/base64/@filename | mapping-collection/back-matter/resource/base64/@filename | profile/back-matter/resource/base64/@filename | component-definition/back-matter/resource/base64/@filename | system-security-plan/back-matter/resource/base64/@filename | assessment-plan/back-matter/resource/base64/@filename | assessment-results/back-matter/resource/base64/@filename | plan-of-action-and-milestones/back-matter/resource/base64/@filename" -->
+      <flag in-json="string"
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/base64/@media-type | mapping-collection/back-matter/resource/base64/@media-type | profile/back-matter/resource/base64/@media-type | component-definition/back-matter/resource/base64/@media-type | system-security-plan/back-matter/resource/base64/@media-type | assessment-plan/back-matter/resource/base64/@media-type | assessment-results/back-matter/resource/base64/@media-type | plan-of-action-and-milestones/back-matter/resource/base64/@media-type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="mapping-collection/@uuid" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="catalog/back-matter/resource/base64/@media-type | profile/back-matter/resource/base64/@media-type | component-definition/back-matter/resource/base64/@media-type | system-security-plan/back-matter/resource/base64/@media-type | assessment-plan/back-matter/resource/base64/@media-type | assessment-results/back-matter/resource/base64/@media-type | plan-of-action-and-milestones/back-matter/resource/base64/@media-type" -->
+   <xsl:template match="j:map[@key='mapping-collection']/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="(j:map[@key='mapping'] | (j:array[@key='mappings']/j:map | j:map[@key='mappings']))/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="mapping/@uuid" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="(j:map[@key='mapping'] | (j:array[@key='mappings']/j:map | j:map[@key='mappings']))/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:string[@key='uuid']" priority="1"><!-- XML match="profile/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='imports']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="import/@href" -->
+                  priority="1"><!-- XML match="import/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='imports']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls']"><!-- XML match="profile/import/include-controls/@with-child-controls | profile/import/exclude-controls/@with-child-controls | profile/merge/custom//group/insert-controls/include-controls/@with-child-controls | profile/merge/custom//group/insert-controls/exclude-controls/@with-child-controls | profile/merge/custom/insert-controls/include-controls/@with-child-controls | profile/merge/custom/insert-controls/exclude-controls/@with-child-controls" -->
       <flag in-json="string"
-            as-type="token"
-            name="with-child-controls"
-            key="with-child-controls"
-            gi="with-child-controls">
+             as-type="token"
+             name="with-child-controls"
+             key="with-child-controls"
+             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern']"><!-- XML match="profile/import/include-controls/matching/@pattern | profile/import/exclude-controls/matching/@pattern | profile/merge/custom//group/insert-controls/include-controls/matching/@pattern | profile/merge/custom//group/insert-controls/exclude-controls/matching/@pattern | profile/merge/custom/insert-controls/include-controls/matching/@pattern | profile/merge/custom/insert-controls/exclude-controls/matching/@pattern" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='matching']/j:map/j:string[@key='pattern']"><!-- XML match="matching/@pattern" -->
       <flag in-json="string"
-            as-type="string"
-            name="pattern"
-            key="pattern"
-            gi="pattern">
+             as-type="string"
+             name="pattern"
+             key="pattern"
+             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='matching']/j:map/j:string[@key='pattern']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']/j:string[@key='method']"
-                 priority="5"><!-- XML match="profile/merge/combine/@method" -->
+                  priority="5"><!-- XML match="profile/merge/combine/@method" -->
       <flag in-json="string"
-            as-type="string"
-            name="method"
-            key="method"
-            gi="method">
+             as-type="string"
+             name="method"
+             key="method"
+             gi="method">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']/j:string[@key='method']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']" priority="1"><!-- XML match="group/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="group/@class" -->
+                  priority="1"><!-- XML match="group/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='insert-controls']/j:map/j:string[@key='order']"
-                 priority="1"><!-- XML match="insert-controls/@order" -->
+                  priority="1"><!-- XML match="insert-controls/@order" -->
       <flag in-json="string"
-            as-type="token"
-            name="order"
-            key="order"
-            gi="order">
+             as-type="token"
+             name="order"
+             key="order"
+             gi="order">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='insert-controls']/j:map/j:string[@key='order']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 priority="6"><!-- XML match="profile/modify/set-parameter/@param-id" -->
+                  priority="6"><!-- XML match="profile/modify/set-parameter/@param-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='class']"
-                 priority="6"><!-- XML match="profile/modify/set-parameter/@class" -->
+                  priority="6"><!-- XML match="profile/modify/set-parameter/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='depends-on']"
-                 priority="6"><!-- XML match="profile/modify/set-parameter/@depends-on" -->
+                  priority="6"><!-- XML match="profile/modify/set-parameter/@depends-on" -->
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='depends-on']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='alters']/j:map/j:string[@key='control-id']"><!-- XML match="alter/@control-id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:string[@key='control-id']"><!-- XML match="profile/modify/alter/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='alters']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-name']"
-                 priority="1"><!-- XML match="remove/@by-name" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:string[@key='control-id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-name']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-name" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-name"
-            key="by-name"
-            gi="by-name">
+             as-type="token"
+             name="by-name"
+             key="by-name"
+             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-class']"
-                 priority="1"><!-- XML match="remove/@by-class" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-name']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-class']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-class" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-class"
-            key="by-class"
-            gi="by-class">
+             as-type="token"
+             name="by-class"
+             key="by-class"
+             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-id']"
-                 priority="1"><!-- XML match="remove/@by-id" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-class']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-id']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
-                 priority="1"><!-- XML match="remove/@by-item-name" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-id']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-item-name" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-item-name"
-            key="by-item-name"
-            gi="by-item-name">
+             as-type="token"
+             name="by-item-name"
+             key="by-item-name"
+             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-ns']"
-                 priority="1"><!-- XML match="remove/@by-ns" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-ns']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-ns" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-ns"
-            key="by-ns"
-            gi="by-ns">
+             as-type="token"
+             name="by-ns"
+             key="by-ns"
+             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='position']"
-                 priority="1"><!-- XML match="add/@position" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-ns']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='position']"
+                  priority="8"><!-- XML match="profile/modify/alter/add/@position" -->
       <flag in-json="string"
-            as-type="token"
-            name="position"
-            key="position"
-            gi="position">
+             as-type="token"
+             name="position"
+             key="position"
+             default="ending"
+             gi="position">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='position']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='by-id']" priority="1"><!-- XML match="add/@by-id" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='position']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='by-id']"
+                  priority="8"><!-- XML match="profile/modify/alter/add/@by-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='by-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='by-id']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component-definition/@uuid" -->
+                  priority="1"><!-- XML match="component-definition/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='import-component-definitions']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="import-component-definition/@href" -->
+                  priority="1"><!-- XML match="import-component-definition/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='import-component-definitions']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="defined-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="defined-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-role/@role-id" -->
+                  priority="1"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="protocol/@uuid" -->
+                  priority="1"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="protocol/@name" -->
+                  priority="1"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 priority="1"><!-- XML match="port-range/@start" -->
+                  priority="1"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 priority="1"><!-- XML match="port-range/@end" -->
+                  priority="1"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 priority="1"><!-- XML match="port-range/@transport" -->
+                  priority="1"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid']"
-                 priority="7"><!-- XML match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid" -->
+                  priority="7"><!-- XML match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"><!-- XML match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source" -->
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"
+                  priority="7"><!-- XML match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="source"
-            key="source"
-            gi="source">
+             as-type="uri-reference"
+             name="source"
+             key="source"
+             gi="source">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"><!-- XML match="set-parameter/@param-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid" -->
+                  priority="9"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@control-id | component-definition/capability/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@statement-id | component-definition/capability/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 priority="11"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid" -->
+                  priority="11"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="capability/@uuid" -->
+                  priority="1"><!-- XML match="capability/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="capability/@name" -->
+                  priority="1"><!-- XML match="capability/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='incorporates-components']/j:map/j:string[@key='component-uuid']"
-                 priority="1"><!-- XML match="incorporates-component/@component-uuid" -->
+                  priority="1"><!-- XML match="incorporates-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='incorporates-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="system-security-plan/@uuid" -->
+                  priority="1"><!-- XML match="system-security-plan/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-profile']/j:string[@key='href']" priority="1"><!-- XML match="import-profile/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-profile']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="(j:array[@key='system-ids']/j:map | j:map[@key='system-id'])/j:string[@key='identifier-type']"
-                 priority="1"><!-- XML match="system-id/@identifier-type" -->
+                  priority="1"><!-- XML match="system-id/@identifier-type" -->
       <flag in-json="string"
-            as-type="uri"
-            name="identifier-type"
-            key="identifier-type"
-            gi="identifier-type">
+             as-type="uri"
+             name="identifier-type"
+             key="identifier-type"
+             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="(j:array[@key='system-ids']/j:map | j:map[@key='system-id'])/j:string[@key='identifier-type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='uuid']"
-                 priority="7"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/@uuid" -->
+                  priority="7"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:string[@key='system']"
-                 priority="9"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system" -->
+                  priority="9"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']/j:string[@key='state']"
-                 priority="5"><!-- XML match="system-security-plan/system-characteristics/status/@state" -->
+                  priority="5"><!-- XML match="system-security-plan/system-characteristics/status/@state" -->
       <flag in-json="string"
-            as-type="string"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="string"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='diagrams']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="diagram/@uuid" -->
+                  priority="1"><!-- XML match="diagram/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='diagrams']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="system-security-plan/system-implementation/leveraged-authorization/@uuid" -->
+                  priority="6"><!-- XML match="system-security-plan/system-implementation/leveraged-authorization/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 priority="7"><!-- XML match="system-security-plan/system-implementation/component/status/@state | assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state | assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state | plan-of-action-and-milestones/local-definitions/component/status/@state" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
+                  priority="7"><!-- XML match="system-security-plan/system-implementation/component/status/@state | assessment-plan/local-definitions/component/status/@state | assessment-plan/assessment-assets/component/status/@state | assessment-results/result/local-definitions/component/status/@state | assessment-results/result/local-definitions/assessment-assets/component/status/@state | plan-of-action-and-milestones/local-definitions/component/status/@state | plan-of-action-and-milestones/local-definitions/assessment-assets/component/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="inventory-item/@uuid" -->
+                  priority="1"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 priority="8"><!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid | assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid | assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid | plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid" -->
+                  priority="8"><!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid | assessment-plan/local-definitions/inventory-item/implemented-component/@component-uuid | assessment-results/result/local-definitions/inventory-item/implemented-component/@component-uuid | plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@uuid" -->
+                  priority="6"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid" -->
+                  priority="8"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='component-uuid']"
-                 priority="1"><!-- XML match="by-component/@component-uuid" -->
+                  priority="1"><!-- XML match="by-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="by-component/@uuid" -->
+                  priority="1"><!-- XML match="by-component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
-                 priority="1"><!-- XML match="implementation-status/@state" -->
+                  priority="1"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid']"
-                 priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid" -->
+                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="13"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="13"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid']"
-                 priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid" -->
+                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="13"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="13"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@provided-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid']"
-                 mode="keep-value-property"
-                 priority="13"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="13"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid']"
-                 priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid" -->
+                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@provided-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid']"
-                 priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid" -->
+                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@responsibility-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@responsibility-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="responsibility-uuid"
-            key="responsibility-uuid"
-            gi="responsibility-uuid">
+             as-type="uuid"
+             name="responsibility-uuid"
+             key="responsibility-uuid"
+             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="assessment-plan/@uuid" -->
+                  priority="1"><!-- XML match="assessment-plan/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']" priority="1"><!-- XML match="import-ssp/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"><!-- XML match="objectives-and-methods/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='objectives-and-methods']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="activity/@uuid" -->
+                  priority="1"><!-- XML match="activity/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='activities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="assessment-plan/local-definitions/activity/step/@uuid | assessment-results/local-definitions/activity/step/@uuid" -->
+                  priority="8"><!-- XML match="assessment-plan/local-definitions/activity/step/@uuid | assessment-results/local-definitions/activity/step/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"><!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-plan/reviewed-controls/control-selection/include-control/@control-id | assessment-plan/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/include-control/@control-id | assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/@control-id | assessment-results/result/reviewed-controls/control-selection/include-control/@control-id | assessment-results/result/reviewed-controls/control-selection/exclude-control/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='control-id'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"><!-- XML match="include-objective/@objective-id | exclude-objective/@objective-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="objective-id"
-            key="objective-id"
-            gi="objective-id">
+             as-type="token"
+             name="objective-id"
+             key="objective-id"
+             gi="objective-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-objectives']/j:map/j:string[@key='objective-id'] | j:array[@key='exclude-objectives']/j:map/j:string[@key='objective-id']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="part/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='assessment-subjects']/j:map/j:string[@key='type'] | j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="assessment-subject/@type | subject/@type" -->
+                  priority="1"><!-- XML match="assessment-subject/@type | subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='assessment-subjects']/j:map/j:string[@key='type'] | j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/@uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/@uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/@uuid | plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
-                 priority="8"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
+                  priority="8"><!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/@component-uuid | assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid | plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid'] | j:array[@key='tasks']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="task/@uuid | assessment-task/@uuid" -->
+                  priority="1"><!-- XML match="task/@uuid | assessment-task/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid'] | j:array[@key='tasks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type'] | j:array[@key='tasks']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="task/@type | assessment-task/@type" -->
+                  priority="1"><!-- XML match="task/@type | assessment-task/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type'] | j:array[@key='tasks']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/on-date/@date | assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date | plan-of-action-and-milestones/risk/response//task/timing/on-date/@date" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/on-date/@date | assessment-results/result/local-definitions//assessment-task/timing/on-date/@date | assessment-results/result/risk/response//task/timing/on-date/@date | plan-of-action-and-milestones/risk/response//task/timing/on-date/@date" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@start | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@start | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@start | assessment-results/result/risk/response//task/timing/within-date-range/@start | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@end | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/within-date-range/@end | assessment-results/result/local-definitions//assessment-task/timing/within-date-range/@end | assessment-results/result/risk/response//task/timing/within-date-range/@end | plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@period | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@period | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@period | assessment-results/result/risk/response//task/timing/at-frequency/@period | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period" -->
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@unit | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit" -->
+                  priority="8"><!-- XML match="assessment-plan//task/timing/at-frequency/@unit | assessment-results/result/local-definitions//assessment-task/timing/at-frequency/@unit | assessment-results/result/risk/response//task/timing/at-frequency/@unit | plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 priority="7"><!-- XML match="assessment-plan//task/dependency/@task-uuid | assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid | plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid" -->
+                  priority="7"><!-- XML match="assessment-plan//task/dependency/@task-uuid | assessment-results/result/local-definitions//assessment-task/dependency/@task-uuid | assessment-results/result/risk/response//task/dependency/@task-uuid | plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 priority="7"><!-- XML match="assessment-plan//task/associated-activity/@activity-uuid | assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid | plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid" -->
+                  priority="7"><!-- XML match="assessment-plan//task/associated-activity/@activity-uuid | assessment-results/result/local-definitions//assessment-task/associated-activity/@activity-uuid | assessment-results/result/risk/response//task/associated-activity/@activity-uuid | plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="assessment-results/@uuid" -->
+                  priority="1"><!-- XML match="assessment-results/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-ap']/j:string[@key='href']" priority="1"><!-- XML match="import-ap/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-ap']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='results']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="result/@uuid" -->
+                  priority="1"><!-- XML match="result/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='results']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="assessment-results/result/assessment-log/entry/@uuid" -->
+                  priority="8"><!-- XML match="assessment-results/result/assessment-log/entry/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"
-                 priority="1"><!-- XML match="logged-by/@party-uuid" -->
+                  priority="1"><!-- XML match="logged-by/@party-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="party-uuid"
-            key="party-uuid"
-            gi="party-uuid">
+             as-type="uuid"
+             name="party-uuid"
+             key="party-uuid"
+             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="logged-by/@role-id" -->
+                  priority="1"><!-- XML match="logged-by/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"
-                 priority="1"><!-- XML match="related-task/@task-uuid" -->
+                  priority="1"><!-- XML match="related-task/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
-                 priority="11"><!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid" -->
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
+                  priority="11"><!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | assessment-results/result/finding/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/finding/origin/related-task/identified-subject/@subject-placeholder-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-placeholder-uuid"
-            key="subject-placeholder-uuid"
-            gi="subject-placeholder-uuid">
+             as-type="uuid"
+             name="subject-placeholder-uuid"
+             key="subject-placeholder-uuid"
+             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="observation/@uuid" -->
+                  priority="1"><!-- XML match="observation/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']" priority="1"><!-- XML match="actor/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"
-                 priority="1"><!-- XML match="actor/@actor-uuid" -->
+                  priority="1"><!-- XML match="actor/@actor-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="actor-uuid"
-            key="actor-uuid"
-            gi="actor-uuid">
+             as-type="uuid"
+             name="actor-uuid"
+             key="actor-uuid"
+             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="actor/@role-id" -->
+                  priority="1"><!-- XML match="actor/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="assessment-results/result/observation/subject/@subject-uuid | assessment-results/result/risk/mitigating-factor/subject/@subject-uuid | assessment-results/result/risk/response/required-asset/subject/@subject-uuid | plan-of-action-and-milestones/observation/subject/@subject-uuid | plan-of-action-and-milestones/risk/mitigating-factor/subject/@subject-uuid | plan-of-action-and-milestones/risk/response/required-asset/subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="assessment-results/result/observation/subject/@type | assessment-results/result/risk/mitigating-factor/subject/@type | assessment-results/result/risk/response/required-asset/subject/@type | plan-of-action-and-milestones/observation/subject/@type | plan-of-action-and-milestones/risk/mitigating-factor/subject/@type | plan-of-action-and-milestones/risk/response/required-asset/subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href']"
-                 priority="9"><!-- XML match="assessment-results/result/observation/relevant-evidence/@href | plan-of-action-and-milestones/observation/relevant-evidence/@href" -->
+                  priority="9"><!-- XML match="assessment-results/result/observation/relevant-evidence/@href | plan-of-action-and-milestones/observation/relevant-evidence/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="risk/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"
-                 priority="1"><!-- XML match="threat-id/@system" -->
+                  priority="1"><!-- XML match="threat-id/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="threat-id/@href" -->
+                  priority="1"><!-- XML match="threat-id/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@name | plan-of-action-and-milestones/risk/characterization/facet/@name" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@name | plan-of-action-and-milestones/risk/characterization/facet/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@system | plan-of-action-and-milestones/risk/characterization/facet/@system" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@system | plan-of-action-and-milestones/risk/characterization/facet/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@value | plan-of-action-and-milestones/risk/characterization/facet/@value" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/characterization/facet/@value | plan-of-action-and-milestones/risk/characterization/facet/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@uuid | plan-of-action-and-milestones/risk/mitigating-factor/@uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@uuid | plan-of-action-and-milestones/risk/mitigating-factor/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@implementation-uuid | plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/mitigating-factor/@implementation-uuid | plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="implementation-uuid"
-            key="implementation-uuid"
-            gi="implementation-uuid">
+             as-type="uuid"
+             name="implementation-uuid"
+             key="implementation-uuid"
+             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/response/@uuid | plan-of-action-and-milestones/risk/response/@uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/response/@uuid | plan-of-action-and-milestones/risk/response/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/response/@lifecycle | plan-of-action-and-milestones/risk/response/@lifecycle" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/response/@lifecycle | plan-of-action-and-milestones/risk/response/@lifecycle" -->
       <flag in-json="string"
-            as-type="token"
-            name="lifecycle"
-            key="lifecycle"
-            gi="lifecycle">
+             as-type="token"
+             name="lifecycle"
+             key="lifecycle"
+             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid']"
-                 priority="11"><!-- XML match="assessment-results/result/risk/response/required-asset/@uuid | plan-of-action-and-milestones/risk/response/required-asset/@uuid" -->
+                  priority="11"><!-- XML match="assessment-results/result/risk/response/required-asset/@uuid | plan-of-action-and-milestones/risk/response/required-asset/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 priority="10"><!-- XML match="assessment-results/result/risk/risk-log/entry/@uuid | plan-of-action-and-milestones/risk/risk-log/entry/@uuid" -->
+                  priority="10"><!-- XML match="assessment-results/result/risk/risk-log/entry/@uuid | plan-of-action-and-milestones/risk/risk-log/entry/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid']"
-                 priority="12"><!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid" -->
+                  priority="12"><!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/@response-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="response-uuid"
-            key="response-uuid"
-            gi="response-uuid">
+             as-type="uuid"
+             name="response-uuid"
+             key="response-uuid"
+             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/risk/related-observation/@observation-uuid | plan-of-action-and-milestones/risk/related-observation/@observation-uuid" -->
+                  priority="9"><!-- XML match="assessment-results/result/risk/related-observation/@observation-uuid | plan-of-action-and-milestones/risk/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="finding/@uuid" -->
+                  priority="1"><!-- XML match="finding/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='target']/j:string[@key='type']" priority="1"><!-- XML match="target/@type" -->
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="(j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='type']"
+                  priority="1"><!-- XML match="target/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='target']/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='target']/j:string[@key='target-id']" priority="1"><!-- XML match="target/@target-id" -->
+   <xsl:template match="(j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="(j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='target-id']"
+                  priority="1"><!-- XML match="target/@target-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="target-id"
-            key="target-id"
-            gi="target-id">
+             as-type="token"
+             name="target-id"
+             key="target-id"
+             gi="target-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='target']/j:string[@key='target-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/target/status/@state" -->
+   <xsl:template match="(j:array[@key='targets']/j:map | j:map[@key='target'])/j:string[@key='target-id']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
+                  priority="9"><!-- XML match="assessment-results/result/finding/target/status/@state | plan-of-action-and-milestones/finding/target/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/target/status/@reason" -->
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
+                  priority="9"><!-- XML match="assessment-results/result/finding/target/status/@reason | plan-of-action-and-milestones/finding/target/status/@reason" -->
       <flag in-json="string"
-            as-type="token"
-            name="reason"
-            key="reason"
-            gi="reason">
+             as-type="token"
+             name="reason"
+             key="reason"
+             gi="reason">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/related-observation/@observation-uuid" -->
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
+                  priority="9"><!-- XML match="assessment-results/result/finding/related-observation/@observation-uuid | plan-of-action-and-milestones/finding/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 priority="9"><!-- XML match="assessment-results/result/finding/associated-risk/@risk-uuid" -->
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
+                  priority="9"><!-- XML match="assessment-results/result/finding/associated-risk/@risk-uuid | plan-of-action-and-milestones/finding/associated-risk/@risk-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="plan-of-action-and-milestones/@uuid" -->
+                  priority="1"><!-- XML match="plan-of-action-and-milestones/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="poam-item/@uuid" -->
+                  priority="1"><!-- XML match="poam-item/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-findings']/j:map/j:string[@key='finding-uuid']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-finding/@finding-uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="finding-uuid"
+             key="finding-uuid"
+             gi="finding-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-findings']/j:map/j:string[@key='finding-uuid']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3561,22 +3897,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -3584,22 +3920,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -3607,22 +3943,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -3630,22 +3966,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -3653,14 +3989,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -3675,14 +4011,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -3690,15 +4026,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3706,22 +4042,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -3729,22 +4065,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -3752,22 +4088,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -3775,22 +4111,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -3798,22 +4134,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3821,41 +4157,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/document-id-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3863,22 +4199,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3886,22 +4236,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -3909,23 +4259,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3933,22 +4283,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3956,22 +4306,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3979,14 +4345,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -4002,34 +4368,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -4037,22 +4403,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -4060,22 +4426,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -4083,22 +4449,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -4106,79 +4472,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4186,22 +4553,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -4209,22 +4596,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -4232,41 +4619,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/party/external-id-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4274,52 +4661,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -4332,34 +4719,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -4367,22 +4754,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -4390,22 +4777,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -4413,22 +4800,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -4436,41 +4823,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4478,22 +4865,68 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4501,22 +4934,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -4524,23 +4957,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -4548,23 +4981,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4572,14 +5005,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -4588,15 +5021,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -4604,65 +5037,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog/param/guideline-->
    <xsl:template priority="3"
-                 match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4670,22 +5103,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4693,22 +5126,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -4716,23 +5149,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -4740,23 +5173,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4764,14 +5197,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -4780,15 +5213,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -4796,65 +5229,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//control/param/guideline-->
    <xsl:template priority="4"
-                 match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4862,22 +5295,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4885,46 +5318,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//control//part-->
    <xsl:template priority="3"
-                 match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//control//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4932,22 +5365,150 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping" -->
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='target-resource']"/>
+         <xsl:apply-templates select="*[@key='maps']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/target-resource/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/relationship" -->
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='ns']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching catalog//control/mapping/map/relationship-->
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  mode="get-value-property">
+      <value as-type="token" key="type" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/source/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//control/mapping/map/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4955,22 +5516,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4978,22 +5539,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -5001,23 +5562,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -5025,23 +5586,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5049,14 +5610,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -5065,15 +5626,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -5081,65 +5642,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group/param/guideline-->
    <xsl:template priority="4"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5147,22 +5708,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5170,46 +5731,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group//part-->
    <xsl:template priority="3"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5217,22 +5778,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5240,22 +5801,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5263,22 +5824,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -5286,23 +5847,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -5310,23 +5871,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5334,14 +5895,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -5350,15 +5911,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -5366,65 +5927,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group//control/param/guideline-->
    <xsl:template priority="5"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5432,22 +5993,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5455,46 +6016,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for catalog//group//control//part-->
    <xsl:template priority="4"
-                 match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog//group//control//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5502,14 +6063,142 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping" -->
+      <assembly name="mapping" key="mapping" gi="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='target-resource']"/>
+         <xsl:apply-templates select="*[@key='maps']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/target-resource/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/relationship" -->
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='ns']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching catalog//group//control/mapping/map/relationship-->
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  mode="get-value-property">
+      <value as-type="token" key="type" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/source/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="catalog//group//control/mapping/map/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='catalog']//j:array[@key='groups']/j:map//j:array[@key='controls']/j:map/j:map[@key='mapping']/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -5525,15 +6214,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5541,23 +6230,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5565,33 +6254,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching catalog/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -5604,15 +6293,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5620,22 +6309,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5643,14 +6332,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -5660,14 +6349,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="catalog/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -5678,130 +6367,130 @@
    </xsl:template>
    <!-- matching catalog/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='catalog']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/title" -->
+      <!-- XML match="mapping-collection/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/published" -->
+      <!-- XML match="mapping-collection/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/last-modified" -->
+      <!-- XML match="mapping-collection/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/version" -->
+      <!-- XML match="mapping-collection/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/oscal-version" -->
+      <!-- XML match="mapping-collection/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='published']"/>
@@ -5813,321 +6502,351 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions" -->
+      <!-- XML match="mapping-collection/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="*"/>
       </group>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision/title" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision/published" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision/last-modified" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision/version" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision/oscal-version" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/revisions/revision/link/text" -->
+      <!-- XML match="mapping-collection/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/document-id" -->
+      <!-- XML match="mapping-collection/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching profile/metadata/document-id-->
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+   <!-- matching mapping-collection/metadata/document-id-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/link/text" -->
+      <!-- XML match="mapping-collection/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/role/title" -->
+      <!-- XML match="mapping-collection/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/role/short-name" -->
+      <!-- XML match="mapping-collection/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/role/description" -->
+      <!-- XML match="mapping-collection/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/role/link/text" -->
+      <!-- XML match="mapping-collection/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/title" -->
+      <!-- XML match="mapping-collection/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/address" -->
+      <!-- XML match="mapping-collection/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">address</xsl:attribute>
@@ -6140,327 +6859,348 @@
          <xsl:apply-templates select="*[@key='country']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/address/addr-line" -->
+      <!-- XML match="mapping-collection/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/address/city" -->
+      <!-- XML match="mapping-collection/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/address/state" -->
+      <!-- XML match="mapping-collection/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/address/postal-code" -->
+      <!-- XML match="mapping-collection/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/address/country" -->
+      <!-- XML match="mapping-collection/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/email-address" -->
+      <!-- XML match="mapping-collection/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/telephone-number" -->
+      <!-- XML match="mapping-collection/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching profile/metadata/location/telephone-number-->
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+   <!-- matching mapping-collection/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/url" -->
+      <!-- XML match="mapping-collection/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/location/link/text" -->
+      <!-- XML match="mapping-collection/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/name" -->
+      <!-- XML match="mapping-collection/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/short-name" -->
+      <!-- XML match="mapping-collection/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/external-id" -->
+      <!-- XML match="mapping-collection/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching profile/metadata/party/external-id-->
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+   <!-- matching mapping-collection/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/link/text" -->
+      <!-- XML match="mapping-collection/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/email-address" -->
+      <!-- XML match="mapping-collection/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/telephone-number" -->
+      <!-- XML match="mapping-collection/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching profile/metadata/party/telephone-number-->
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+   <!-- matching mapping-collection/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/address" -->
+      <!-- XML match="mapping-collection/metadata/party/address" -->
       <assembly name="address" gi="address">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='addr-lines']"/>
@@ -6470,9770 +7210,9692 @@
          <xsl:apply-templates select="*[@key='country']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/address/addr-line" -->
+      <!-- XML match="mapping-collection/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/address/city" -->
+      <!-- XML match="mapping-collection/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/address/state" -->
+      <!-- XML match="mapping-collection/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/address/postal-code" -->
+      <!-- XML match="mapping-collection/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/address/country" -->
+      <!-- XML match="mapping-collection/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/party/member-of-organization" -->
+      <!-- XML match="mapping-collection/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/metadata/responsible-party/link/text" -->
+      <!-- XML match="mapping-collection/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/include-controls" -->
-      <assembly name="select-control-by-id" gi="include-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="9">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/include-controls/with-id" -->
+      <!-- XML match="mapping-collection/metadata/action/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/include-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/exclude-controls" -->
-      <assembly name="select-control-by-id" gi="exclude-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/exclude-controls/with-id" -->
+      <!-- XML match="mapping-collection/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/exclude-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/combine" -->
-      <assembly as-type="empty" name="combine" key="combine" gi="combine">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">combine</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='method']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='flat']"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/flat" -->
-      <assembly as-type="empty" name="flat" key="flat" gi="flat">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">flat</xsl:attribute>
-         </xsl:if>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:boolean[@key='as-is']"
-                 priority="5">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='source-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/as-is" -->
+      <!-- XML match="mapping-collection/mapping/source-resource/link/text" -->
       <field collapsible="no"
-             as-type="boolean"
-             name="as-is"
-             key="as-is"
-             gi="as-is"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">as-is</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:boolean[@key='as-is']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="boolean" in-json="boolean">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='source-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom" -->
-      <assembly name="custom" key="custom" gi="custom">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">custom</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='groups']"/>
-         <xsl:apply-templates select="*[@key='insert-controls']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/title" -->
+      <!-- XML match="mapping-collection/mapping/target-resource/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/link/text" -->
+      <!-- XML match="mapping-collection/mapping/map/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="10">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/label" -->
+      <!-- XML match="mapping-collection/mapping/map/relationship" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">label</xsl:attribute>
+            <xsl:attribute name="key">relationship</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching mapping-collection/mapping/map/relationship-->
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  mode="get-value-property">
+      <value as-type="token" key="type" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="10">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/usage" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+      <!-- XML match="mapping-collection/mapping/map/source/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">usage</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/constraint/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="mapping-collection/mapping/map/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="13">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/constraint/test" -->
-      <assembly name="test" gi="test">
-         <xsl:apply-templates select="*[@key='expression']"/>
+      <!-- XML match="mapping-collection/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="14">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/constraint/test/expression" -->
+      <!-- XML match="mapping-collection/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">expression</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <!-- matching markup-multiline value for profile/merge/custom//group/param/guideline-->
-   <xsl:template priority="6"
-                 match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/param/select/choice" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="mapping-collection/back-matter/resource/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="10">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group//part/title" -->
+      <!-- XML match="mapping-collection/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching mapping-collection/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for profile/merge/custom//group//part-->
-   <xsl:template priority="5"
-                 match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='text']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group//part/link/text" -->
+      <!-- XML match="mapping-collection/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/include-controls" -->
-      <assembly name="select-control-by-id" gi="include-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="15">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/with-id" -->
+      <!-- XML match="mapping-collection/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="15">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="12">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls" -->
-      <assembly name="select-control-by-id" gi="exclude-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
+      <!-- XML match="mapping-collection/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="14">
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/with-id" -->
+      <!-- XML match="mapping-collection/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base64</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching mapping-collection/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="14">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/include-controls" -->
-      <assembly name="select-control-by-id" gi="include-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="12">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/include-controls/with-id" -->
+      <!-- XML match="profile/metadata/title" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/exclude-controls" -->
-      <assembly name="select-control-by-id" gi="exclude-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="11">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/with-id" -->
+      <!-- XML match="profile/metadata/published" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter" -->
-      <assembly name="set-parameter" gi="set-parameter">
-         <xsl:apply-templates select="*[@key='param-id']"/>
-         <xsl:apply-templates select="*[@key='class']"/>
-         <xsl:apply-templates select="*[@key='depends-on']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='label']"/>
-         <xsl:apply-templates select="*[@key='usage']"/>
-         <xsl:apply-templates select="*[@key='constraints']"/>
-         <xsl:apply-templates select="*[@key='guidelines']"/>
-         <xsl:apply-templates select="*[@key='values']"/>
-         <xsl:apply-templates select="*[@key='select']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/link/text" -->
+      <!-- XML match="profile/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='label']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/label" -->
+      <!-- XML match="profile/metadata/version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">label</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='usage']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/usage" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">usage</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/constraint/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/constraint/test" -->
-      <assembly name="test" gi="test">
-         <xsl:apply-templates select="*[@key='expression']"/>
+      <!-- XML match="profile/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/constraint/test/expression" -->
-      <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">expression</xsl:attribute>
+            <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <!-- matching markup-multiline value for profile/modify/set-parameter/guideline-->
-   <xsl:template priority="4"
-                 match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+         <xsl:apply-templates select="*"/>
+      </group>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/set-parameter/select/choice" -->
+      <!-- XML match="profile/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/title" -->
+      <!-- XML match="profile/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/link/text" -->
+      <!-- XML match="profile/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/label" -->
+      <!-- XML match="profile/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">label</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/usage" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/revisions/revision/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">usage</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/constraint/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/revisions/revision/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="13">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/constraint/test" -->
-      <assembly name="test" gi="test">
-         <xsl:apply-templates select="*[@key='expression']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+      <!-- XML match="profile/metadata/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="14">
+   <!-- matching profile/metadata/document-id-->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/constraint/test/expression" -->
+      <!-- XML match="profile/metadata/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">expression</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for profile/modify/alter/add/param/guideline-->
-   <xsl:template priority="6"
-                 match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="13">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/param/select/choice" -->
+      <!-- XML match="profile/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add/link/text" -->
+      <!-- XML match="profile/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add//part/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/role/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for profile/modify/alter/add//part-->
-   <xsl:template priority="5"
-                 match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/modify/alter/add//part/link/text" -->
+      <!-- XML match="profile/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource" -->
-      <assembly name="resource" gi="resource">
+      <!-- XML match="profile/metadata/location" -->
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
          <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='document-ids']"/>
-         <xsl:apply-templates select="*[@key='citation']"/>
-         <xsl:apply-templates select="*[@key='rlinks']"/>
-         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/title" -->
+      <!-- XML match="profile/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/document-id" -->
+      <!-- XML match="profile/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching profile/back-matter/resource/document-id-->
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/citation" -->
-      <assembly name="citation" key="citation" gi="citation">
+      <!-- XML match="profile/metadata/location/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='text']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/citation/text" -->
+      <!-- XML match="profile/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/citation/link/text" -->
+      <!-- XML match="profile/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/rlink" -->
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="*[@key='href']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
-         <xsl:apply-templates select="*[@key='hashes']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/back-matter/resource/base64" -->
+      <!-- XML match="profile/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='filename']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching profile/back-matter/resource/base64-->
-   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
-      <value as-type="base64Binary" key="value" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/title" -->
+      <!-- XML match="profile/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching profile/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/published" -->
+      <!-- XML match="profile/metadata/location/url" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
-         </xsl:if>
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/last-modified" -->
+      <!-- XML match="profile/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/version" -->
+      <!-- XML match="profile/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/oscal-version" -->
+      <!-- XML match="profile/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision" -->
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='published']"/>
-         <xsl:apply-templates select="*[@key='last-modified']"/>
-         <xsl:apply-templates select="*[@key='version']"/>
-         <xsl:apply-templates select="*[@key='oscal-version']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+      <!-- XML match="profile/metadata/party/external-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions" -->
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*"/>
-      </group>
+   <!-- matching profile/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision/title" -->
+      <!-- XML match="profile/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision/published" -->
+      <!-- XML match="profile/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
-         </xsl:if>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision/last-modified" -->
+      <!-- XML match="profile/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching profile/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision/version" -->
+      <!-- XML match="profile/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision/oscal-version" -->
+      <!-- XML match="profile/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/revisions/revision/link/text" -->
+      <!-- XML match="profile/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/document-id" -->
+      <!-- XML match="profile/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching component-definition/metadata/document-id-->
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/link/text" -->
+      <!-- XML match="profile/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/role/title" -->
+      <!-- XML match="profile/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/role/short-name" -->
+      <!-- XML match="profile/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/role/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="profile/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/role/link/text" -->
+      <!-- XML match="profile/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/title" -->
+      <!-- XML match="profile/import/include-controls" -->
+      <assembly name="select-control-by-id" gi="include-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/import/exclude-controls" -->
+      <assembly name="select-control-by-id" gi="exclude-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/merge/combine" -->
+      <assembly as-type="empty" name="combine" key="combine" gi="combine">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">combine</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='method']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='flat']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/merge/flat" -->
+      <assembly as-type="empty" name="flat" key="flat" gi="flat">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">flat</xsl:attribute>
+         </xsl:if>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:boolean[@key='as-is']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/merge/as-is" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="boolean"
+              name="as-is"
+              key="as-is"
+              gi="as-is"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">as-is</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:boolean[@key='as-is']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="boolean" in-json="boolean">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/address" -->
-      <assembly name="address" key="address" gi="address">
+      <!-- XML match="profile/merge/custom" -->
+      <assembly name="custom" key="custom" gi="custom">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
+            <xsl:attribute name="key">custom</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
+         <xsl:apply-templates select="*[@key='groups']"/>
+         <xsl:apply-templates select="*[@key='insert-controls']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/address/addr-line" -->
+      <!-- XML match="profile/merge/custom//group/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/address/city" -->
+      <!-- XML match="profile/merge/custom//group/param/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/address/state" -->
+      <!-- XML match="profile/merge/custom//group/param/label" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/address/postal-code" -->
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+      <!-- XML match="profile/merge/custom//group/param/usage" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/address/country" -->
-      <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+      <!-- XML match="profile/merge/custom//group/param/constraint/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/email-address" -->
+      <!-- XML match="profile/merge/custom//group/param/constraint/test" -->
+      <assembly name="test" gi="test">
+         <xsl:apply-templates select="*[@key='expression']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/merge/custom//group/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">expression</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/telephone-number" -->
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
+   <!-- matching markup-multiline value for profile/merge/custom//group/param/guideline-->
+   <xsl:template priority="6"
+                  match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
       </field>
    </xsl:template>
-   <!-- matching component-definition/metadata/location/telephone-number-->
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/url" -->
+      <!-- XML match="profile/merge/custom//group/param/select/choice" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uri" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/location/link/text" -->
+      <!-- XML match="profile/merge/custom//group/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/name" -->
+      <!-- XML match="profile/merge/custom//group//part/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <!-- matching markup-multiline value for profile/merge/custom//group//part-->
+   <xsl:template priority="5"
+                  match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/short-name" -->
+      <!-- XML match="profile/merge/custom//group//part/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/external-id" -->
-      <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
+      <!-- XML match="profile/merge/custom//group/insert-controls/include-controls" -->
+      <assembly name="select-control-by-id" gi="include-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
+      </assembly>
    </xsl:template>
-   <!-- matching component-definition/metadata/party/external-id-->
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="id" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls" -->
+      <assembly name="select-control-by-id" gi="exclude-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/link/text" -->
+      <!-- XML match="profile/merge/custom/insert-controls/include-controls" -->
+      <assembly name="select-control-by-id" gi="include-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/merge/custom/insert-controls/exclude-controls" -->
+      <assembly name="select-control-by-id" gi="exclude-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/set-parameter" -->
+      <assembly name="set-parameter" gi="set-parameter">
+         <xsl:apply-templates select="*[@key='param-id']"/>
+         <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='depends-on']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='label']"/>
+         <xsl:apply-templates select="*[@key='usage']"/>
+         <xsl:apply-templates select="*[@key='constraints']"/>
+         <xsl:apply-templates select="*[@key='guidelines']"/>
+         <xsl:apply-templates select="*[@key='values']"/>
+         <xsl:apply-templates select="*[@key='select']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/set-parameter/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='label']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/email-address" -->
+      <!-- XML match="profile/modify/set-parameter/label" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">label</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='label']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/telephone-number" -->
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <!-- matching component-definition/metadata/party/telephone-number-->
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/address" -->
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='usage']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/address/addr-line" -->
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+      <!-- XML match="profile/modify/set-parameter/usage" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">usage</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='usage']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/address/city" -->
-      <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+      <!-- XML match="profile/modify/set-parameter/constraint/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/address/state" -->
+      <!-- XML match="profile/modify/set-parameter/constraint/test" -->
+      <assembly name="test" gi="test">
+         <xsl:apply-templates select="*[@key='expression']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/set-parameter/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+   <!-- matching markup-multiline value for profile/modify/set-parameter/guideline-->
+   <xsl:template priority="4"
+                  match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/address/postal-code" -->
+      <!-- XML match="profile/modify/set-parameter/select/choice" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
-         </xsl:if>
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/address/country" -->
+      <!-- XML match="profile/modify/alter" -->
+      <assembly name="alter" gi="alter">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='removes']"/>
+         <xsl:apply-templates select="*[@key='adds']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/remove" -->
+      <assembly as-type="empty" name="remove" gi="remove">
+         <xsl:apply-templates select="*[@key='by-name']"/>
+         <xsl:apply-templates select="*[@key='by-class']"/>
+         <xsl:apply-templates select="*[@key='by-id']"/>
+         <xsl:apply-templates select="*[@key='by-item-name']"/>
+         <xsl:apply-templates select="*[@key='by-ns']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/add" -->
+      <assembly name="add" gi="add">
+         <xsl:apply-templates select="*[@key='position']"/>
+         <xsl:apply-templates select="*[@key='by-id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='params']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='parts']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='title']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/add/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/party/member-of-organization" -->
+      <!-- XML match="profile/modify/alter/add/param/link/text" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/metadata/responsible-party/link/text" -->
+      <!-- XML match="profile/modify/alter/add/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <!-- XML match="profile/modify/alter/add/param/usage" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/description" -->
+      <!-- XML match="profile/modify/alter/add/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/purpose" -->
+      <!-- XML match="profile/modify/alter/add/param/constraint/test" -->
+      <assembly name="test" gi="test">
+         <xsl:apply-templates select="*[@key='expression']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/add/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <!-- matching markup-multiline value for profile/modify/alter/add/param/guideline-->
+   <xsl:template priority="6"
+                  match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/add/param/select/choice" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/link/text" -->
+      <!-- XML match="profile/modify/alter/add/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/responsible-role/link/text" -->
+      <!-- XML match="profile/modify/alter/add//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="7">
+   <!-- matching markup-multiline value for profile/modify/alter/add//part-->
+   <xsl:template priority="5"
+                  match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/protocol/title" -->
+      <!-- XML match="profile/modify/alter/add//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map"
-                 priority="6">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation" -->
-      <assembly name="control-implementation" gi="control-implementation">
+      <!-- XML match="profile/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='source']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='set-parameters']"/>
-         <xsl:apply-templates select="*[@key='implemented-requirements']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="profile/back-matter/resource/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="profile/back-matter/resource/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/set-parameter/value" -->
+      <!-- XML match="profile/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching profile/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement" -->
-      <assembly name="implemented-requirement" gi="implemented-requirement">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+      <!-- XML match="profile/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='text']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='set-parameters']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='statements']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="profile/back-matter/resource/citation/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/link/text" -->
+      <!-- XML match="profile/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="12">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
-      <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+      <!-- XML match="profile/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
+      <!-- XML match="profile/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching profile/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement" -->
-      <assembly name="statement" gi="statement">
-         <xsl:apply-templates select="*[@key='statement-id']"/>
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
+      <!-- XML match="component-definition/metadata/published" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
+      <!-- XML match="component-definition/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/link/text" -->
+      <!-- XML match="component-definition/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='incorporates-components']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/incorporates-component/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/revisions/revision/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='incorporates-components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation" -->
-      <assembly name="control-implementation" gi="control-implementation">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='source']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='set-parameters']"/>
-         <xsl:apply-templates select="*[@key='implemented-requirements']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/revisions/revision/published" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/link/text" -->
+      <!-- XML match="component-definition/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/set-parameter/value" -->
+      <!-- XML match="component-definition/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement" -->
-      <assembly name="implemented-requirement" gi="implemented-requirement">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='set-parameters']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='statements']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/revisions/revision/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
+      <!-- XML match="component-definition/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="12">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
+      <!-- XML match="component-definition/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching component-definition/metadata/document-id-->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
+      <!-- XML match="component-definition/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement" -->
-      <assembly name="statement" gi="statement">
-         <xsl:apply-templates select="*[@key='statement-id']"/>
-         <xsl:apply-templates select="*[@key='uuid']"/>
+      <!-- XML match="component-definition/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/role/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text" -->
+      <!-- XML match="component-definition/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
+      <!-- XML match="component-definition/metadata/role/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource" -->
-      <assembly name="resource" gi="resource">
+      <!-- XML match="component-definition/metadata/location" -->
+      <assembly name="location" gi="location">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
          <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='document-ids']"/>
-         <xsl:apply-templates select="*[@key='citation']"/>
-         <xsl:apply-templates select="*[@key='rlinks']"/>
-         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/title" -->
+      <!-- XML match="component-definition/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/document-id" -->
+      <!-- XML match="component-definition/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching component-definition/back-matter/resource/document-id-->
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/citation" -->
-      <assembly name="citation" key="citation" gi="citation">
+      <!-- XML match="component-definition/metadata/location/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='text']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/citation/text" -->
+      <!-- XML match="component-definition/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/citation/link/text" -->
+      <!-- XML match="component-definition/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/rlink" -->
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="*[@key='href']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
-         <xsl:apply-templates select="*[@key='hashes']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="component-definition/back-matter/resource/base64" -->
+      <!-- XML match="component-definition/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='filename']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching component-definition/back-matter/resource/base64-->
-   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
-      <value as-type="base64Binary" key="value" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/title" -->
+      <!-- XML match="component-definition/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching component-definition/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/published" -->
+      <!-- XML match="component-definition/metadata/location/url" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
-         </xsl:if>
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/last-modified" -->
+      <!-- XML match="component-definition/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/version" -->
+      <!-- XML match="component-definition/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/oscal-version" -->
+      <!-- XML match="component-definition/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision" -->
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='published']"/>
-         <xsl:apply-templates select="*[@key='last-modified']"/>
-         <xsl:apply-templates select="*[@key='version']"/>
-         <xsl:apply-templates select="*[@key='oscal-version']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+      <!-- XML match="component-definition/metadata/party/external-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions" -->
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*"/>
-      </group>
+   <!-- matching component-definition/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision/title" -->
+      <!-- XML match="component-definition/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision/published" -->
+      <!-- XML match="component-definition/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
-         </xsl:if>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision/last-modified" -->
+      <!-- XML match="component-definition/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching component-definition/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision/version" -->
+      <!-- XML match="component-definition/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision/oscal-version" -->
+      <!-- XML match="component-definition/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/revisions/revision/link/text" -->
+      <!-- XML match="component-definition/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/document-id" -->
+      <!-- XML match="component-definition/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching system-security-plan/metadata/document-id-->
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/link/text" -->
+      <!-- XML match="component-definition/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/role/title" -->
+      <!-- XML match="component-definition/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/role/short-name" -->
+      <!-- XML match="component-definition/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/role/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/role/link/text" -->
+      <!-- XML match="component-definition/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/title" -->
+      <!-- XML match="component-definition/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/address" -->
-      <assembly name="address" key="address" gi="address">
+      <!-- XML match="component-definition/component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/address/addr-line" -->
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/address/city" -->
+      <!-- XML match="component-definition/component/purpose" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/address/state" -->
+      <!-- XML match="component-definition/component/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/address/postal-code" -->
+      <!-- XML match="component-definition/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/address/country" -->
+      <!-- XML match="component-definition/component/protocol/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/email-address" -->
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/telephone-number" -->
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <!-- matching system-security-plan/metadata/location/telephone-number-->
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
+      <!-- XML match="component-definition/component/control-implementation" -->
+      <assembly name="control-implementation" gi="control-implementation">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='source']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='set-parameters']"/>
+         <xsl:apply-templates select="*[@key='implemented-requirements']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/url" -->
-      <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/component/control-implementation/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uri" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/location/link/text" -->
+      <!-- XML match="component-definition/component/control-implementation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/name" -->
+      <!-- XML match="component-definition/component/control-implementation/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/short-name" -->
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement" -->
+      <assembly name="implemented-requirement" gi="implemented-requirement">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='set-parameters']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='statements']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/external-id" -->
-      <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <!-- matching system-security-plan/metadata/party/external-id-->
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="id" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/link/text" -->
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/email-address" -->
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/telephone-number" -->
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching system-security-plan/metadata/party/telephone-number-->
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/address" -->
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement" -->
+      <assembly name="statement" gi="statement">
+         <xsl:apply-templates select="*[@key='statement-id']"/>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/address/addr-line" -->
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/address/city" -->
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/address/state" -->
+      <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/address/postal-code" -->
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/capability/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/address/country" -->
+      <!-- XML match="component-definition/capability/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='incorporates-components']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/party/member-of-organization" -->
-      <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/capability/incorporates-component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='incorporates-components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/metadata/responsible-party/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/capability/control-implementation" -->
+      <assembly name="control-implementation" gi="control-implementation">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='source']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='set-parameters']"/>
+         <xsl:apply-templates select="*[@key='implemented-requirements']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/capability/control-implementation/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-name" -->
+      <!-- XML match="component-definition/capability/control-implementation/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-name"
-             key="system-name"
-             gi="system-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">system-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name-short']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-name-short" -->
+      <!-- XML match="component-definition/capability/control-implementation/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-name-short"
-             key="system-name-short"
-             gi="system-name-short"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">system-name-short</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name-short']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='description']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/description" -->
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement" -->
+      <assembly name="implemented-requirement" gi="implemented-requirement">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='set-parameters']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='statements']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/link/text" -->
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='date-authorized']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/date-authorized" -->
-      <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">date-authorized</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='date-authorized']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="date" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='security-sensitivity-level']"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/security-sensitivity-level" -->
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-sensitivity-level"
-             key="security-sensitivity-level"
-             gi="security-sensitivity-level"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-sensitivity-level</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='security-sensitivity-level']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/link/text" -->
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map"
-                 priority="6">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type" -->
-      <assembly name="information-type" gi="information-type">
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement" -->
+      <assembly name="statement" gi="statement">
+         <xsl:apply-templates select="*[@key='statement-id']"/>
          <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='categorizations']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='confidentiality-impact']"/>
-         <xsl:apply-templates select="*[@key='integrity-impact']"/>
-         <xsl:apply-templates select="*[@key='availability-impact']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='title']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/title" -->
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization" -->
-      <assembly name="categorization" gi="categorization">
-         <xsl:apply-templates select="*[@key='system']"/>
-         <xsl:apply-templates select="*[@key='information-type-ids']"/>
+      <!-- XML match="component-definition/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:array[@key='information-type-ids']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id" -->
+      <!-- XML match="component-definition/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="information-type-id"
-             gi="information-type-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:array[@key='information-type-ids']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="component-definition/back-matter/resource/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']"
-                 priority="7">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/back-matter/resource/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching component-definition/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact" -->
-      <assembly name="confidentiality-impact"
-                key="confidentiality-impact"
-                gi="confidentiality-impact">
+      <!-- XML match="component-definition/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
+            <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='text']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='base']"/>
-         <xsl:apply-templates select="*[@key='selected']"/>
-         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
+      <!-- XML match="component-definition/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='base']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
+      <!-- XML match="component-definition/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='base']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='selected']"
-                 priority="8">
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
+      <!-- XML match="component-definition/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">selected</xsl:attribute>
+            <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='selected']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching component-definition/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='adjustment-justification']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='adjustment-justification']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact" -->
-      <assembly name="integrity-impact"
-                key="integrity-impact"
-                gi="integrity-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">integrity-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='base']"/>
-         <xsl:apply-templates select="*[@key='selected']"/>
-         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
+      <!-- XML match="system-security-plan/metadata/published" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='base']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base" -->
+      <!-- XML match="system-security-plan/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='base']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='selected']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected" -->
+      <!-- XML match="system-security-plan/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">selected</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='selected']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='adjustment-justification']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='adjustment-justification']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact" -->
-      <assembly name="availability-impact"
-                key="availability-impact"
-                gi="availability-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">availability-impact</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="system-security-plan/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='base']"/>
-         <xsl:apply-templates select="*[@key='selected']"/>
-         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text" -->
+      <!-- XML match="system-security-plan/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='base']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base" -->
+      <!-- XML match="system-security-plan/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='base']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='selected']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected" -->
+      <!-- XML match="system-security-plan/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">selected</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='selected']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='adjustment-justification']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/revisions/revision/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='adjustment-justification']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-confidentiality']"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality" -->
+      <!-- XML match="system-security-plan/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-confidentiality"
-             key="security-objective-confidentiality"
-             gi="security-objective-confidentiality"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-objective-confidentiality</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-confidentiality']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-integrity']"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity" -->
+      <!-- XML match="system-security-plan/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-integrity"
-             key="security-objective-integrity"
-             gi="security-objective-integrity"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-objective-integrity</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-integrity']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-availability']"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability" -->
+      <!-- XML match="system-security-plan/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-availability"
-             key="security-objective-availability"
-             gi="security-objective-availability"
-             in-json="SCALAR">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching system-security-plan/metadata/document-id-->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">security-objective-availability</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-availability']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/status" -->
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
+      <!-- XML match="system-security-plan/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/role/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/link/text" -->
+      <!-- XML match="system-security-plan/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/description" -->
+      <!-- XML match="system-security-plan/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text" -->
+      <!-- XML match="system-security-plan/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption" -->
+      <!-- XML match="system-security-plan/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">caption</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/network-architecture/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/network-architecture/link/text" -->
+      <!-- XML match="system-security-plan/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/location/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/link/text" -->
+      <!-- XML match="system-security-plan/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/caption" -->
+      <!-- XML match="system-security-plan/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">caption</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/data-flow/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="system-security-plan/metadata/location/email-address" -->
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/data-flow/link/text" -->
+      <!-- XML match="system-security-plan/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching system-security-plan/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="system-security-plan/metadata/location/url" -->
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/link/text" -->
+      <!-- XML match="system-security-plan/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/caption" -->
+      <!-- XML match="system-security-plan/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/party/name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">caption</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/responsible-party/link/text" -->
+      <!-- XML match="system-security-plan/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/link/text" -->
+      <!-- XML match="system-security-plan/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization" -->
-      <assembly name="leveraged-authorization" gi="leveraged-authorization">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='party-uuid']"/>
-         <xsl:apply-templates select="*[@key='date-authorized']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='title']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching system-security-plan/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/link/text" -->
+      <!-- XML match="system-security-plan/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='party-uuid']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/party-uuid" -->
+      <!-- XML match="system-security-plan/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             key="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">party-uuid</xsl:attribute>
-         </xsl:if>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='party-uuid']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='date-authorized']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/date-authorized" -->
+      <!-- XML match="system-security-plan/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">date-authorized</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='date-authorized']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="date" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching system-security-plan/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/user/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+      <!-- XML match="system-security-plan/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/user/short-name" -->
+      <!-- XML match="system-security-plan/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/user/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/party/address/city" -->
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/user/link/text" -->
+      <!-- XML match="system-security-plan/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/title" -->
+      <!-- XML match="system-security-plan/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/party/address/country" -->
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/title" -->
+      <!-- XML match="system-security-plan/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/metadata/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/purpose" -->
+      <!-- XML match="system-security-plan/metadata/action/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/link/text" -->
+      <!-- XML match="system-security-plan/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/status" -->
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="system-name"
+              key="system-name"
+              gi="system-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">system-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name-short']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/component/protocol/title" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-name-short" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="system-name-short"
+              key="system-name-short"
+              gi="system-name-short"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">system-name-short</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name-short']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='description']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/inventory-item/description" -->
+      <!-- XML match="system-security-plan/system-characteristics/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/inventory-item/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='date-authorized']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/date-authorized" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='date-authorized']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="date" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component" -->
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="*[@key='component-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-parties']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='security-sensitivity-level']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/security-sensitivity-level" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-sensitivity-level"
+              key="security-sensitivity-level"
+              gi="security-sensitivity-level"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">security-sensitivity-level</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='security-sensitivity-level']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']"
-                 priority="3">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation" -->
-      <assembly name="control-implementation"
-                key="control-implementation"
-                gi="control-implementation">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">control-implementation</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type" -->
+      <assembly name="information-type" gi="information-type">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='set-parameters']"/>
-         <xsl:apply-templates select="*[@key='implemented-requirements']"/>
+         <xsl:apply-templates select="*[@key='categorizations']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='confidentiality-impact']"/>
+         <xsl:apply-templates select="*[@key='integrity-impact']"/>
+         <xsl:apply-templates select="*[@key='availability-impact']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:string[@key='description']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/set-parameter/value" -->
-      <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement" -->
-      <assembly name="implemented-requirement" gi="implemented-requirement">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='set-parameters']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='statements']"/>
-         <xsl:apply-templates select="*[@key='by-components']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization" -->
+      <assembly name="categorization" gi="categorization">
+         <xsl:apply-templates select="*[@key='system']"/>
+         <xsl:apply-templates select="*[@key='information-type-ids']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:array[@key='information-type-ids']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="information-type-id"
+              gi="information-type-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:array[@key='information-type-ids']/j:string"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement" -->
-      <assembly name="statement" gi="statement">
-         <xsl:apply-templates select="*[@key='statement-id']"/>
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='by-components']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='base']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='base']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='selected']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='selected']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='adjustment-justification']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='adjustment-justification']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='base']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='base']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='selected']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export" -->
-      <assembly name="export" key="export" gi="export">
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected" -->
+      <field collapsible="no"
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">export</xsl:attribute>
+            <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='provided']"/>
-         <xsl:apply-templates select="*[@key='responsibilities']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='selected']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='adjustment-justification']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='adjustment-justification']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided" -->
-      <assembly name="provided" gi="provided">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='base']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base" -->
+      <field collapsible="no"
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='base']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='selected']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='selected']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='adjustment-justification']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='adjustment-justification']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility" -->
-      <assembly name="responsibility" gi="responsibility">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='provided-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-confidentiality']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality" -->
+      <field collapsible="no"
+              as-type="string"
+              name="security-objective-confidentiality"
+              key="security-objective-confidentiality"
+              gi="security-objective-confidentiality"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">security-objective-confidentiality</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-confidentiality']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-integrity']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-integrity"
+              key="security-objective-integrity"
+              gi="security-objective-integrity"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">security-objective-integrity</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-integrity']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-availability']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-availability"
+              key="security-objective-availability"
+              gi="security-objective-availability"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">security-objective-availability</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-availability']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited" -->
-      <assembly name="inherited" gi="inherited">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='provided-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+      <!-- XML match="system-security-plan/system-characteristics/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description" -->
+      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied" -->
-      <assembly name="satisfied" gi="satisfied">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/network-architecture/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/network-architecture/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
+      <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
+      <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/caption" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">caption</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export" -->
-      <assembly name="export" key="export" gi="export">
+      <!-- XML match="system-security-plan/system-characteristics/data-flow/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">export</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='provided']"/>
-         <xsl:apply-templates select="*[@key='responsibilities']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description" -->
+      <!-- XML match="system-security-plan/system-characteristics/data-flow/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided" -->
-      <assembly name="provided" gi="provided">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/caption" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
+      <!-- XML match="system-security-plan/system-characteristics/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility" -->
-      <assembly name="responsibility" gi="responsibility">
+      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization" -->
+      <assembly name="leveraged-authorization" gi="leveraged-authorization">
          <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='provided-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='party-uuid']"/>
+         <xsl:apply-templates select="*[@key='date-authorized']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='party-uuid']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/party-uuid" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              key="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">party-uuid</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='party-uuid']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited" -->
-      <assembly name="inherited" gi="inherited">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='provided-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='date-authorized']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/date-authorized" -->
+      <field collapsible="no"
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='date-authorized']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="date" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/user/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/user/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied" -->
-      <assembly name="satisfied" gi="satisfied">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
+      <!-- XML match="system-security-plan/system-implementation/user/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/user/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource" -->
-      <assembly name="resource" gi="resource">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='document-ids']"/>
-         <xsl:apply-templates select="*[@key='citation']"/>
-         <xsl:apply-templates select="*[@key='rlinks']"/>
-         <xsl:apply-templates select="*[@key='base64']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/title" -->
+      <!-- XML match="system-security-plan/system-implementation/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/description" -->
+      <!-- XML match="system-security-plan/system-implementation/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/document-id" -->
-      <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <!-- matching system-security-plan/back-matter/resource/document-id-->
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/citation" -->
-      <assembly name="citation" key="citation" gi="citation">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='text']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/citation/text" -->
+      <!-- XML match="system-security-plan/system-implementation/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/citation/link/text" -->
+      <!-- XML match="system-security-plan/system-implementation/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/rlink" -->
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="*[@key='href']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
-         <xsl:apply-templates select="*[@key='hashes']"/>
+      <!-- XML match="system-security-plan/system-implementation/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/back-matter/resource/base64" -->
+      <!-- XML match="system-security-plan/system-implementation/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='filename']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching system-security-plan/back-matter/resource/base64-->
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
-      <value as-type="base64Binary" key="value" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/title" -->
+      <!-- XML match="system-security-plan/system-implementation/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/published" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/system-implementation/inventory-item/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/last-modified" -->
+      <!-- XML match="system-security-plan/system-implementation/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/version" -->
+      <!-- XML match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/oscal-version" -->
+      <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component" -->
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision" -->
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='published']"/>
-         <xsl:apply-templates select="*[@key='last-modified']"/>
-         <xsl:apply-templates select="*[@key='version']"/>
-         <xsl:apply-templates select="*[@key='oscal-version']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions" -->
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*"/>
-      </group>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision/title" -->
+      <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']"
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision/published" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation" -->
+      <assembly name="control-implementation"
+                 key="control-implementation"
+                 gi="control-implementation">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">control-implementation</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='set-parameters']"/>
+         <xsl:apply-templates select="*[@key='implemented-requirements']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:string[@key='description']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision/last-modified" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision/version" -->
+      <!-- XML match="system-security-plan/control-implementation/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision/oscal-version" -->
-      <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement" -->
+      <assembly name="implemented-requirement" gi="implemented-requirement">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='set-parameters']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='statements']"/>
+         <xsl:apply-templates select="*[@key='by-components']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/revisions/revision/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/document-id" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-plan/metadata/document-id-->
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/role/title" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement" -->
+      <assembly name="statement" gi="statement">
+         <xsl:apply-templates select="*[@key='statement-id']"/>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='by-components']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/role/short-name" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/role/description" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/role/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/title" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/address" -->
-      <assembly name="address" key="address" gi="address">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export" -->
+      <assembly name="export" key="export" gi="export">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
+            <xsl:attribute name="key">export</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='provided']"/>
+         <xsl:apply-templates select="*[@key='responsibilities']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/address/addr-line" -->
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/address/city" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/address/state" -->
-      <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided" -->
+      <assembly name="provided" gi="provided">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/address/postal-code" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/address/country" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/email-address" -->
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/telephone-number" -->
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <!-- matching assessment-plan/metadata/location/telephone-number-->
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility" -->
+      <assembly name="responsibility" gi="responsibility">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='provided-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/url" -->
-      <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uri" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/location/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/name" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/short-name" -->
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited" -->
+      <assembly name="inherited" gi="inherited">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='provided-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/external-id" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-plan/metadata/party/external-id-->
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="id" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/email-address" -->
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied" -->
+      <assembly name="satisfied" gi="satisfied">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/telephone-number" -->
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-plan/metadata/party/telephone-number-->
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/address" -->
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/address/addr-line" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/address/city" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/address/state" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/address/postal-code" -->
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/address/country" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/party/member-of-organization" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/metadata/responsible-party/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export" -->
+      <assembly name="export" key="export" gi="export">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">export</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='provided']"/>
+         <xsl:apply-templates select="*[@key='responsibilities']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']"
-                 priority="3">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions" -->
-      <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">local-definitions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='components']"/>
-         <xsl:apply-templates select="*[@key='inventory-items']"/>
-         <xsl:apply-templates select="*[@key='users']"/>
-         <xsl:apply-templates select="*[@key='objectives-and-methods']"/>
-         <xsl:apply-templates select="*[@key='activities']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/title" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/description" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided" -->
+      <assembly name="provided" gi="provided">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/purpose" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/status" -->
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility" -->
+      <assembly name="responsibility" gi="responsibility">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='provided-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/responsible-role/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/component/protocol/title" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/inventory-item/description" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited" -->
+      <assembly name="inherited" gi="inherited">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='provided-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/inventory-item/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component" -->
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="*[@key='component-uuid']"/>
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied" -->
+      <assembly name="satisfied" gi="satisfied">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='responsibility-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/user/title" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/user/short-name" -->
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/user/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/user/link/text" -->
+      <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/title" -->
+      <!-- XML match="system-security-plan/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/description" -->
+      <!-- XML match="system-security-plan/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="system-security-plan/back-matter/resource/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching system-security-plan/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='text']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/back-matter/resource/citation/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/link/text" -->
+      <!-- XML match="system-security-plan/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/title" -->
+      <!-- XML match="system-security-plan/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/back-matter/resource/base64" -->
+      <field collapsible="no"
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base64</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching system-security-plan/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for assessment-plan/local-definitions/objectives-and-methods//part-->
-   <xsl:template priority="4"
-                 match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/link/text" -->
+      <!-- XML match="assessment-plan/metadata/published" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/title" -->
+      <!-- XML match="assessment-plan/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/link/text" -->
+      <!-- XML match="assessment-plan/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step" -->
-      <assembly name="step" gi="step">
-         <xsl:apply-templates select="*[@key='uuid']"/>
+      <!-- XML match="assessment-plan/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
          <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='reviewed-controls']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/title" -->
+      <!-- XML match="assessment-plan/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/revisions/revision/published" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/link/text" -->
+      <!-- XML match="assessment-plan/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/revisions/revision/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text" -->
+      <!-- XML match="assessment-plan/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection" -->
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-controls']"/>
-         <xsl:apply-templates select="*[@key='exclude-controls']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/revisions/revision/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
+      <!-- XML match="assessment-plan/metadata/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-plan/metadata/document-id-->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
+      <!-- XML match="assessment-plan/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/role/title" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
+      <!-- XML match="assessment-plan/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-objectives']"/>
-         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
+      <!-- XML match="assessment-plan/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
+      <!-- XML match="assessment-plan/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/step/responsible-role/link/text" -->
+      <!-- XML match="assessment-plan/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/link/text" -->
+      <!-- XML match="assessment-plan/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection" -->
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-controls']"/>
-         <xsl:apply-templates select="*[@key='exclude-controls']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/location/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
+      <!-- XML match="assessment-plan/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control" -->
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
+      <!-- XML match="assessment-plan/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control" -->
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
+      <!-- XML match="assessment-plan/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection" -->
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-objectives']"/>
-         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="assessment-plan/metadata/location/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching assessment-plan/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
+      <!-- XML match="assessment-plan/metadata/location/url" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/local-definitions/activity/responsible-role/link/text" -->
+      <!-- XML match="assessment-plan/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']"
-                 priority="3">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/terms-and-conditions" -->
-      <assembly name="terms-and-conditions"
-                key="terms-and-conditions"
-                gi="terms-and-conditions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='parts']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/terms-and-conditions//part/title" -->
+      <!-- XML match="assessment-plan/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/party/name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for assessment-plan/terms-and-conditions//part-->
-   <xsl:template priority="3"
-                 match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/terms-and-conditions//part/link/text" -->
+      <!-- XML match="assessment-plan/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="4">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="assessment-plan/metadata/party/external-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching assessment-plan/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/link/text" -->
+      <!-- XML match="assessment-plan/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection" -->
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-controls']"/>
-         <xsl:apply-templates select="*[@key='exclude-controls']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="assessment-plan/metadata/party/email-address" -->
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection/link/text" -->
+      <!-- XML match="assessment-plan/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching assessment-plan/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control" -->
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      <!-- XML match="assessment-plan/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id" -->
+      <!-- XML match="assessment-plan/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control" -->
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id" -->
+      <!-- XML match="assessment-plan/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection" -->
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-objectives']"/>
-         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/party/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/link/text" -->
+      <!-- XML match="assessment-plan/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/metadata/party/address/country" -->
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-subject/link/text" -->
+      <!-- XML match="assessment-plan/metadata/party/member-of-organization" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-subject/include-subject/link/text" -->
+      <!-- XML match="assessment-plan/metadata/action/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-plan/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']"
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/title" -->
+      <!-- XML match="assessment-plan/local-definitions" -->
+      <assembly name="local-definitions"
+                 key="local-definitions"
+                 gi="local-definitions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">local-definitions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='components']"/>
+         <xsl:apply-templates select="*[@key='inventory-items']"/>
+         <xsl:apply-templates select="*[@key='users']"/>
+         <xsl:apply-templates select="*[@key='objectives-and-methods']"/>
+         <xsl:apply-templates select="*[@key='activities']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/description" -->
+      <!-- XML match="assessment-plan/local-definitions/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/purpose" -->
+      <!-- XML match="assessment-plan/local-definitions/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/status" -->
+      <!-- XML match="assessment-plan/local-definitions/component/status" -->
       <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
@@ -16242,116 +16904,127 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/responsible-role/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/component/protocol/title" -->
+      <!-- XML match="assessment-plan/local-definitions/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/assessment-platform" -->
-      <assembly name="assessment-platform" gi="assessment-platform">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='uses-components']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+      <!-- XML match="assessment-plan/local-definitions/inventory-item/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/title" -->
+      <!-- XML match="assessment-plan/local-definitions/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component" -->
-      <assembly name="uses-component" gi="uses-component">
+      <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component" -->
+      <assembly name="implemented-component" gi="implemented-component">
          <xsl:apply-templates select="*[@key='component-uuid']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
@@ -16359,4566 +17032,7059 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/title" -->
+      <!-- XML match="assessment-plan/local-definitions/user/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/description" -->
+      <!-- XML match="assessment-plan/local-definitions/user/short-name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/user/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/user/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/timing" -->
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='on-date']"/>
-         <xsl:apply-templates select="*[@key='within-date-range']"/>
-         <xsl:apply-templates select="*[@key='at-frequency']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/timing/on-date" -->
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='date']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/timing/within-date-range" -->
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/timing/at-frequency" -->
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='period']"/>
-         <xsl:apply-templates select="*[@key='unit']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/dependency" -->
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="*[@key='task-uuid']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity" -->
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="*[@key='activity-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity/responsible-role/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/user/authorized-privilege/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity/subject/description" -->
+      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity/subject/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <!-- matching markup-multiline value for assessment-plan/local-definitions/objectives-and-methods//part-->
+   <xsl:template priority="4"
+                  match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/objectives-and-methods//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step" -->
+      <assembly name="step" gi="step">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='reviewed-controls']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/step/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan//task/responsible-role/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/step/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource" -->
-      <assembly name="resource" gi="resource">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='document-ids']"/>
-         <xsl:apply-templates select="*[@key='citation']"/>
-         <xsl:apply-templates select="*[@key='rlinks']"/>
-         <xsl:apply-templates select="*[@key='base64']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/title" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/description" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/document-id" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-plan/back-matter/resource/document-id-->
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/citation" -->
-      <assembly name="citation" key="citation" gi="citation">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='text']"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection" -->
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-controls']"/>
+         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/citation/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/citation/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/rlink" -->
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="*[@key='href']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
-         <xsl:apply-templates select="*[@key='hashes']"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-plan/back-matter/resource/base64" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='filename']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-plan/back-matter/resource/base64-->
-   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
-      <value as-type="base64Binary" key="value" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/title" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/published" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-objectives']"/>
+         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/last-modified" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/version" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/step/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/oscal-version" -->
-      <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision" -->
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='published']"/>
-         <xsl:apply-templates select="*[@key='last-modified']"/>
-         <xsl:apply-templates select="*[@key='version']"/>
-         <xsl:apply-templates select="*[@key='oscal-version']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions" -->
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*"/>
-      </group>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision/title" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision/published" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection" -->
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-controls']"/>
+         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision/last-modified" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision/version" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control" -->
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision/oscal-version" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control" -->
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/revisions/revision/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection" -->
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-objectives']"/>
+         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/document-id" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-results/metadata/document-id-->
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/link/text" -->
+      <!-- XML match="assessment-plan/local-definitions/activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']"
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/role/title" -->
+      <!-- XML match="assessment-plan/terms-and-conditions" -->
+      <assembly name="terms-and-conditions"
+                 key="terms-and-conditions"
+                 gi="terms-and-conditions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">terms-and-conditions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='parts']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/terms-and-conditions//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <!-- matching markup-multiline value for assessment-plan/terms-and-conditions//part-->
+   <xsl:template priority="3"
+                  match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/role/short-name" -->
+      <!-- XML match="assessment-plan/terms-and-conditions//part/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='terms-and-conditions']//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/role/description" -->
+      <!-- XML match="assessment-plan/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/role/link/text" -->
+      <!-- XML match="assessment-plan/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection" -->
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-controls']"/>
+         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/address" -->
-      <assembly name="address" key="address" gi="address">
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/address/addr-line" -->
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/address/city" -->
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control" -->
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/address/state" -->
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control" -->
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/address/postal-code" -->
-      <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection" -->
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-objectives']"/>
+         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/address/country" -->
+      <!-- XML match="assessment-plan/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/email-address" -->
-      <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/assessment-subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/telephone-number" -->
+      <!-- XML match="assessment-plan/assessment-subject/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-results/metadata/location/telephone-number-->
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/url" -->
+      <!-- XML match="assessment-plan/assessment-subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uri" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/location/link/text" -->
+      <!-- XML match="assessment-plan/assessment-subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:array[@key='assessment-subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/name" -->
+      <!-- XML match="assessment-plan/assessment-assets/component/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/short-name" -->
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+      <!-- XML match="assessment-plan/assessment-assets/component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/external-id" -->
+      <!-- XML match="assessment-plan/assessment-assets/component/purpose" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">purpose</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-results/metadata/party/external-id-->
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="id" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/link/text" -->
+      <!-- XML match="assessment-plan/assessment-assets/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/email-address" -->
+      <!-- XML match="assessment-plan/assessment-assets/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/assessment-assets/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/telephone-number" -->
+      <!-- XML match="assessment-plan/assessment-assets/component/protocol/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-results/metadata/party/telephone-number-->
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/address" -->
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
+      <!-- XML match="assessment-plan/assessment-assets/assessment-platform" -->
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='uses-components']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/address/addr-line" -->
+      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/address/city" -->
+      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/address/state" -->
+      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component" -->
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/address/postal-code" -->
+      <!-- XML match="assessment-plan/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/address/country" -->
+      <!-- XML match="assessment-plan//task/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/timing" -->
+      <assembly name="timing" key="timing" gi="timing">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">timing</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='on-date']"/>
+         <xsl:apply-templates select="*[@key='within-date-range']"/>
+         <xsl:apply-templates select="*[@key='at-frequency']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/timing/on-date" -->
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='date']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/timing/within-date-range" -->
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/timing/at-frequency" -->
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='period']"/>
+         <xsl:apply-templates select="*[@key='unit']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/dependency" -->
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="*[@key='task-uuid']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity" -->
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="*[@key='activity-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity/responsible-role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity/subject/include-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/associated-activity/subject/exclude-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/subject/include-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/subject/exclude-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan//task/responsible-role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-plan/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='text']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/citation/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/citation/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-plan/back-matter/resource/base64" -->
+      <field collapsible="no"
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base64</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-plan/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='assessment-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/published" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/last-modified" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision/published" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision/last-modified" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/revisions/revision/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-results/metadata/document-id-->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/role/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/role/short-name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/role/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">address</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/address/city" -->
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/address/postal-code" -->
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/address/country" -->
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/email-address" -->
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-results/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/url" -->
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/location/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/short-name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/external-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-results/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/email-address" -->
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching assessment-results/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/address/city" -->
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/address/postal-code" -->
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/address/country" -->
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/party/member-of-organization" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']"
+                  priority="3">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions" -->
+      <assembly name="local-definitions"
+                 key="local-definitions"
+                 gi="local-definitions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">local-definitions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='objectives-and-methods']"/>
+         <xsl:apply-templates select="*[@key='activities']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/objectives-and-methods/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/objectives-and-methods/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <!-- matching markup-multiline value for assessment-results/local-definitions/objectives-and-methods//part-->
+   <xsl:template priority="4"
+                  match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step" -->
+      <assembly name="step" gi="step">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='reviewed-controls']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection" -->
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-controls']"/>
+         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/party/member-of-organization" -->
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/metadata/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
+      <field collapsible="no"
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
+      <field collapsible="no"
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-objectives']"/>
+         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/step/responsible-role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection" -->
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-controls']"/>
+         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control" -->
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
+      <field collapsible="no"
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control" -->
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection" -->
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-objectives']"/>
+         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']"
-                 priority="3">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions" -->
-      <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">local-definitions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='objectives-and-methods']"/>
-         <xsl:apply-templates select="*[@key='activities']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/objectives-and-methods/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/objectives-and-methods/link/text" -->
+      <!-- XML match="assessment-results/local-definitions/activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='title']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/title" -->
+      <!-- XML match="assessment-results/result/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for assessment-results/local-definitions/objectives-and-methods//part-->
-   <xsl:template priority="4"
-                 match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/objectives-and-methods//part/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='objectives-and-methods']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='start']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/title" -->
+      <!-- XML match="assessment-results/result/start" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='start']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='end']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/end" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='end']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/link/text" -->
+      <!-- XML match="assessment-results/result/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step" -->
-      <assembly name="step" gi="step">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='reviewed-controls']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
+      <!-- XML match="assessment-results/result/local-definitions" -->
+      <assembly name="local-definitions"
+                 key="local-definitions"
+                 gi="local-definitions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">local-definitions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='components']"/>
+         <xsl:apply-templates select="*[@key='inventory-items']"/>
+         <xsl:apply-templates select="*[@key='users']"/>
+         <xsl:apply-templates select="*[@key='assessment-assets']"/>
+         <xsl:apply-templates select="*[@key='tasks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/title" -->
+      <!-- XML match="assessment-results/result/local-definitions/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/description" -->
+      <!-- XML match="assessment-results/result/local-definitions/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection" -->
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-controls']"/>
-         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+      <!-- XML match="assessment-results/result/local-definitions/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions/component/responsible-role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control" -->
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/include-control/statement-id" -->
-      <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions/inventory-item/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control" -->
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-selection/exclude-control/statement-id" -->
+      <!-- XML match="assessment-results/result/local-definitions/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection" -->
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-objectives']"/>
-         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/reviewed-controls/control-objective-selection/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component" -->
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/step/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='steps']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions/user/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/user/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection" -->
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-controls']"/>
-         <xsl:apply-templates select="*[@key='exclude-controls']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/description" -->
+      <!-- XML match="assessment-results/result/local-definitions/user/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/user/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control" -->
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/include-control/statement-id" -->
+      <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/title" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control" -->
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
+      <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-selection/exclude-control/statement-id" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/title" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection" -->
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-objectives']"/>
-         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/description" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/related-controls/control-objective-selection/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/purpose" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">purpose</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:map[@key='related-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/local-definitions/activity/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='local-definitions']/j:array[@key='activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='title']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/title" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform" -->
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='uses-components']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='start']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/start" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='end']"
-                 priority="5">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/end" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component" -->
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions" -->
-      <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">local-definitions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='components']"/>
-         <xsl:apply-templates select="*[@key='inventory-items']"/>
-         <xsl:apply-templates select="*[@key='users']"/>
-         <xsl:apply-templates select="*[@key='assessment-assets']"/>
-         <xsl:apply-templates select="*[@key='tasks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/title" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/description" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/purpose" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing" -->
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
+         <xsl:apply-templates select="*[@key='on-date']"/>
+         <xsl:apply-templates select="*[@key='within-date-range']"/>
+         <xsl:apply-templates select="*[@key='at-frequency']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date" -->
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='date']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/status" -->
-      <assembly name="status" key="status" gi="status">
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range" -->
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency" -->
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='period']"/>
+         <xsl:apply-templates select="*[@key='unit']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency" -->
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="*[@key='task-uuid']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity" -->
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="*[@key='activity-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/component/protocol/title" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/inventory-item/description" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/inventory-item/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/inventory-item/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component" -->
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="*[@key='component-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-parties']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/user/title" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/user/short-name" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/user/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/user/link/text" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/title" -->
+      <!-- XML match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/user/authorized-privilege/description" -->
+      <!-- XML match="assessment-results/result/reviewed-controls/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/title" -->
+      <!-- XML match="assessment-results/result/reviewed-controls/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection" -->
+      <assembly name="control-selection" gi="control-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-controls']"/>
+         <xsl:apply-templates select="*[@key='exclude-controls']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/purpose" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/link/text" -->
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/status" -->
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control" -->
+      <assembly name="select-control-by-id" gi="include-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/component/protocol/title" -->
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control" -->
+      <assembly name="select-control-by-id" gi="exclude-control">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='statement-ids']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="token"
+              name="statement-id"
+              gi="statement-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform" -->
-      <assembly name="assessment-platform" gi="assessment-platform">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
+      <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection" -->
+      <assembly name="control-objective-selection" gi="control-objective-selection">
+         <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='uses-components']"/>
+         <xsl:apply-templates select="*[@key='include-all']"/>
+         <xsl:apply-templates select="*[@key='include-objectives']"/>
+         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/link/text" -->
+      <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component" -->
-      <assembly name="uses-component" gi="uses-component">
-         <xsl:apply-templates select="*[@key='component-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
+      <!-- XML match="assessment-results/result/attestation" -->
+      <assembly name="attestation" gi="attestation">
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
+         <xsl:apply-templates select="*[@key='parts']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
+      <!-- XML match="assessment-results/result/attestation/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/attestation//part/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <!-- matching markup-multiline value for assessment-results/result/attestation//part-->
+   <xsl:template priority="4"
+                  match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+      <field scope="local"
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
+         <value as-type="markup-multiline"
+                 _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
+                 in-json="string">
+            <xsl:value-of select="."/>
+         </value>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/attestation//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/title" -->
+      <!-- XML match="assessment-results/result/assessment-log" -->
+      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">assessment-log</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='entries']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/assessment-log/entry" -->
+      <assembly name="entry" gi="entry">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='logged-by']"/>
+         <xsl:apply-templates select="*[@key='related-tasks']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/assessment-log/entry/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/description" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/start" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing" -->
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='on-date']"/>
-         <xsl:apply-templates select="*[@key='within-date-range']"/>
-         <xsl:apply-templates select="*[@key='at-frequency']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/on-date" -->
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+      <!-- XML match="assessment-results/result/assessment-log/entry/end" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='date']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/within-date-range" -->
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
-      </assembly>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/timing/at-frequency" -->
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+      <!-- XML match="assessment-results/result/assessment-log/entry/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='period']"/>
-         <xsl:apply-templates select="*[@key='unit']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/dependency" -->
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="*[@key='task-uuid']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity" -->
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="*[@key='activity-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/description" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/associated-activity/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/description" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/local-definitions//assessment-task/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/observation/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='local-definitions']//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/description" -->
+      <!-- XML match="assessment-results/result/observation/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/link/text" -->
+      <!-- XML match="assessment-results/result/observation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection" -->
-      <assembly name="control-selection" gi="control-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-controls']"/>
-         <xsl:apply-templates select="*[@key='exclude-controls']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+      <!-- XML match="assessment-results/result/observation/method" -->
+      <field collapsible="no"
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="assessment-results/result/observation/type" -->
+      <field collapsible="no"
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/link/text" -->
+      <!-- XML match="assessment-results/result/observation/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control" -->
-      <assembly name="select-control-by-id" gi="include-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
+      <!-- XML match="assessment-results/result/observation/origin/related-task/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/include-control/statement-id" -->
+      <!-- XML match="assessment-results/result/observation/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control" -->
-      <assembly name="select-control-by-id" gi="exclude-control">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='statement-ids']"/>
-      </assembly>
+      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-selection/exclude-control/statement-id" -->
+      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="statement-id"
-             gi="statement-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-selections']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='statement-ids']/j:string"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection" -->
-      <assembly name="control-objective-selection" gi="control-objective-selection">
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='include-all']"/>
-         <xsl:apply-templates select="*[@key='include-objectives']"/>
-         <xsl:apply-templates select="*[@key='exclude-objectives']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/reviewed-controls/control-objective-selection/link/text" -->
+      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='reviewed-controls']/j:array[@key='control-objective-selections']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map"
-                 priority="6">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/attestation" -->
-      <assembly name="attestation" gi="attestation">
-         <xsl:apply-templates select="*[@key='responsible-parties']"/>
-         <xsl:apply-templates select="*[@key='parts']"/>
+      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/attestation/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/attestation//part/title" -->
+      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <!-- matching markup-multiline value for assessment-results/result/attestation//part-->
-   <xsl:template priority="4"
-                 match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
-      <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
-         <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-assessment-common/assessment-part/prose/PROSE"
-                in-json="string">
-            <xsl:value-of select="."/>
-         </value>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/attestation//part/link/text" -->
+      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='attestations']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log" -->
-      <assembly name="assessment-log" key="assessment-log" gi="assessment-log">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">assessment-log</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='entries']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry" -->
-      <assembly name="entry" gi="entry">
-         <xsl:apply-templates select="*[@key='uuid']"/>
+      <!-- XML match="assessment-results/result/observation/subject" -->
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="*[@key='subject-uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='logged-by']"/>
-         <xsl:apply-templates select="*[@key='related-tasks']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/title" -->
+      <!-- XML match="assessment-results/result/observation/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/description" -->
+      <!-- XML match="assessment-results/result/observation/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/observation/relevant-evidence" -->
+      <assembly name="relevant-evidence" gi="relevant-evidence">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/observation/relevant-evidence/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/start" -->
+      <!-- XML match="assessment-results/result/observation/relevant-evidence/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='collected']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/end" -->
+      <!-- XML match="assessment-results/result/observation/collected" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
+            <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='collected']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='expires']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/link/text" -->
+      <!-- XML match="assessment-results/result/observation/expires" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">expires</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='expires']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/link/text" -->
+      <!-- XML match="assessment-results/result/risk/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/responsible-party/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='statement']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/statement" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='statement']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <!-- XML match="assessment-results/result/risk/origin/related-task/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/assessment-log/entry/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:map[@key='assessment-log']/j:array[@key='entries']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/link/text" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/method" -->
+      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/type" -->
+      <!-- XML match="assessment-results/result/risk/characterization/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/actor/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -20926,103 +24092,199 @@
          <xsl:apply-templates select="*[@key='subjects']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/subject" -->
+      <!-- XML match="assessment-results/result/risk/characterization/facet" -->
+      <assembly name="facet" gi="facet">
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
+         <xsl:apply-templates select="*[@key='value']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/characterization/facet/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/mitigating-factor" -->
+      <assembly name="mitigating-factor" gi="mitigating-factor">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='implementation-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/mitigating-factor/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/mitigating-factor/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/mitigating-factor/subject" -->
       <assembly name="subject-reference" gi="subject">
          <xsl:apply-templates select="*[@key='subject-uuid']"/>
          <xsl:apply-templates select="*[@key='type']"/>
@@ -21032,1246 +24294,1301 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/subject/title" -->
+      <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='deadline']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/relevant-evidence" -->
-      <assembly name="relevant-evidence" gi="relevant-evidence">
-         <xsl:apply-templates select="*[@key='href']"/>
+      <!-- XML match="assessment-results/result/risk/deadline" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">deadline</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='deadline']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response" -->
+      <assembly name="response" gi="response">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='lifecycle']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='origins']"/>
+         <xsl:apply-templates select="*[@key='required-assets']"/>
+         <xsl:apply-templates select="*[@key='tasks']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/relevant-evidence/description" -->
+      <!-- XML match="assessment-results/result/risk/response/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/relevant-evidence/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/collected" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">collected</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/observation/expires" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">expires</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/title" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/description" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/statement" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">statement</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/actor/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="16">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="21">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="21">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/required-asset" -->
+      <assembly name="required-asset" gi="required-asset">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response/required-asset/subject" -->
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="*[@key='subject-uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response/required-asset/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/required-asset/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <!-- XML match="assessment-results/result/risk/response/required-asset/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/response/required-asset/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response/required-asset/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/response//task/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/actor/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/response//task/timing" -->
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
+         <xsl:apply-templates select="*[@key='on-date']"/>
+         <xsl:apply-templates select="*[@key='within-date-range']"/>
+         <xsl:apply-templates select="*[@key='at-frequency']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response//task/timing/on-date" -->
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='date']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/timing/within-date-range" -->
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response//task/timing/at-frequency" -->
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='period']"/>
+         <xsl:apply-templates select="*[@key='unit']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response//task/dependency" -->
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="*[@key='task-uuid']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity" -->
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="*[@key='activity-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/response//task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/facet" -->
-      <assembly name="facet" gi="facet">
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='system']"/>
-         <xsl:apply-templates select="*[@key='value']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/characterization/facet/link/text" -->
+      <!-- XML match="assessment-results/result/risk/response//task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/mitigating-factor" -->
-      <assembly name="mitigating-factor" gi="mitigating-factor">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='implementation-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/mitigating-factor/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/mitigating-factor/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/risk-log" -->
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+         <xsl:apply-templates select="*[@key='entries']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/mitigating-factor/subject" -->
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="*[@key='subject-uuid']"/>
-         <xsl:apply-templates select="*[@key='type']"/>
+      <!-- XML match="assessment-results/result/risk/risk-log/entry" -->
+      <assembly name="entry" gi="entry">
+         <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='logged-by']"/>
+         <xsl:apply-templates select="*[@key='status-change']"/>
+         <xsl:apply-templates select="*[@key='related-responses']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/title" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/mitigating-factor/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/deadline" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/start" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">deadline</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response" -->
-      <assembly name="response" gi="response">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='lifecycle']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='origins']"/>
-         <xsl:apply-templates select="*[@key='required-assets']"/>
-         <xsl:apply-templates select="*[@key='tasks']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/title" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/end" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/actor/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response" -->
+      <assembly name="related-response" gi="related-response">
+         <xsl:apply-templates select="*[@key='response-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='related-tasks']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="21">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="21">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -22279,3209 +25596,3131 @@
          <xsl:apply-templates select="*[@key='subjects']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="21">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="22">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="21">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="22">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="21">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="21">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset" -->
-      <assembly name="required-asset" gi="required-asset">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset/subject" -->
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="*[@key='subject-uuid']"/>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
+      <!-- XML match="assessment-results/result/risk/related-observation" -->
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset/subject/title" -->
+      <!-- XML match="assessment-results/result/finding/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/finding/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset/title" -->
+      <!-- XML match="assessment-results/result/finding/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/finding/origin/actor/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response/required-asset/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/title" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/description" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/timing" -->
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='on-date']"/>
-         <xsl:apply-templates select="*[@key='within-date-range']"/>
-         <xsl:apply-templates select="*[@key='at-frequency']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/timing/on-date" -->
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='date']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/timing/within-date-range" -->
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/timing/at-frequency" -->
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='period']"/>
-         <xsl:apply-templates select="*[@key='unit']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/dependency" -->
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="*[@key='task-uuid']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity" -->
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="*[@key='activity-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/subject/link/text" -->
+      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/subject/include-subject/link/text" -->
+      <!-- XML match="assessment-results/result/finding/target/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/subject/exclude-subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/result/finding/target/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/response//task/responsible-role/link/text" -->
+      <!-- XML match="assessment-results/result/finding/target/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']"
-                 priority="7">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log" -->
-      <assembly name="risk-log" key="risk-log" gi="risk-log">
+      <!-- XML match="assessment-results/result/finding/target/status" -->
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">risk-log</xsl:attribute>
+            <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='entries']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='reason']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map"
-                 priority="9">
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry" -->
-      <assembly name="entry" gi="entry">
+      <!-- XML match="assessment-results/result/finding/implementation-statement-uuid" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/finding/related-observation" -->
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="*[@key='observation-uuid']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/result/finding/associated-risk" -->
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
+         <xsl:apply-templates select="*[@key='risk-uuid']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
          <xsl:apply-templates select="*[@key='uuid']"/>
          <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
          <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='logged-by']"/>
-         <xsl:apply-templates select="*[@key='status-change']"/>
-         <xsl:apply-templates select="*[@key='related-responses']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/title" -->
+      <!-- XML match="assessment-results/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/description" -->
+      <!-- XML match="assessment-results/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/start" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="dateTime-with-timezone" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 priority="10">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/end" -->
+      <!-- XML match="assessment-results/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
-         </xsl:if>
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="dateTime-with-timezone" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching assessment-results/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="assessment-results/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">citation</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response" -->
-      <assembly name="related-response" gi="related-response">
-         <xsl:apply-templates select="*[@key='response-uuid']"/>
+         <xsl:apply-templates select="*[@key='text']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='related-tasks']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/link/text" -->
+      <!-- XML match="assessment-results/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/link/text" -->
+      <!-- XML match="assessment-results/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
+      <!-- XML match="assessment-results/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-results/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching assessment-results/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/metadata/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="16">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/published" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="21">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="21">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="14">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/metadata/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="17">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="22">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="22">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="21">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="21">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/risk/related-observation" -->
-      <assembly as-type="empty" name="related-observation" gi="related-observation">
-         <xsl:apply-templates select="*[@key='observation-uuid']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='title']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/title" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/actor/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching plan-of-action-and-milestones/metadata/document-id-->
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/subject/exclude-subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">address</xsl:attribute>
          </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/city" -->
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/target/title" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/target/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
-         </xsl:if>
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
-         <xsl:value-of select="."/>
+   <!-- matching plan-of-action-and-milestones/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/target/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/url" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/target/status" -->
-      <assembly name="status" key="status" gi="status">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='reason']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/implementation-statement-uuid" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="implementation-statement-uuid"
-             key="implementation-statement-uuid"
-             gi="implementation-statement-uuid"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/related-observation" -->
-      <assembly as-type="empty" name="related-observation" gi="related-observation">
-         <xsl:apply-templates select="*[@key='observation-uuid']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:array[@key='results']/j:map/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/result/finding/associated-risk" -->
-      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
-         <xsl:apply-templates select="*[@key='risk-uuid']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource" -->
-      <assembly name="resource" gi="resource">
+      <!-- XML match="plan-of-action-and-milestones/metadata/party" -->
+      <assembly name="party" gi="party">
          <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='document-ids']"/>
-         <xsl:apply-templates select="*[@key='citation']"/>
-         <xsl:apply-templates select="*[@key='rlinks']"/>
-         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/title" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/name" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/short-name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/document-id" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-results/back-matter/resource/document-id-->
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
+   <!-- matching plan-of-action-and-milestones/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/citation" -->
-      <assembly name="citation" key="citation" gi="citation">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">citation</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='text']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/citation/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/citation/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/rlink" -->
-      <assembly name="rlink" gi="rlink">
-         <xsl:apply-templates select="*[@key='href']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
-         <xsl:apply-templates select="*[@key='hashes']"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching plan-of-action-and-milestones/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="assessment-results/back-matter/resource/base64" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">base64</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='filename']"/>
-         <xsl:apply-templates select="*[@key='media-type']"/>
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching assessment-results/back-matter/resource/base64-->
-   <xsl:template match="j:map[@key='assessment-results']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
-      <value as-type="base64Binary" key="value" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/title" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/published" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/last-modified" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/version" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/party/member-of-organization" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/oscal-version" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision" -->
-      <assembly name="revision" gi="revision">
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='published']"/>
-         <xsl:apply-templates select="*[@key='last-modified']"/>
-         <xsl:apply-templates select="*[@key='version']"/>
-         <xsl:apply-templates select="*[@key='oscal-version']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions" -->
-      <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">revisions</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*"/>
-      </group>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/title" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/action/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
+      <!-- XML match="plan-of-action-and-milestones/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">published</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/title" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">last-modified</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
-      <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">version</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/purpose" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">oscal-version</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/document-id" -->
-      <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <!-- matching plan-of-action-and-milestones/metadata/document-id-->
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="identifier" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
-      </value>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/role/title" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/role/short-name" -->
-      <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/role/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/role/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/title" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component" -->
+      <assembly name="implemented-component" gi="implemented-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/address" -->
-      <assembly name="address" key="address" gi="address">
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">address</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/addr-line" -->
-      <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/city" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/state" -->
-      <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/purpose" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/address/country" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/email-address" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number" -->
-      <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/protocol/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching plan-of-action-and-milestones/metadata/location/telephone-number-->
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/url" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform" -->
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='uses-components']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/title" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uri" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/location/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/name" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component" -->
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/short-name" -->
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">short-name</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='title']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/external-id" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/title" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
-         <xsl:apply-templates select="*[@key='scheme']"/>
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching plan-of-action-and-milestones/metadata/party/external-id-->
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="id" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/observation/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/email-address" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/link/text" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="email" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/telephone-number" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/method" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
-         <xsl:apply-templates select="*[@key='type']"/>
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <!-- matching plan-of-action-and-milestones/metadata/party/telephone-number-->
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
-      <value as-type="string" key="number" in-json="string">
-         <xsl:apply-templates mode="keep-value-property"/>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/address" -->
-      <assembly name="address" gi="address">
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='addr-lines']"/>
-         <xsl:apply-templates select="*[@key='city']"/>
-         <xsl:apply-templates select="*[@key='state']"/>
-         <xsl:apply-templates select="*[@key='postal-code']"/>
-         <xsl:apply-templates select="*[@key='country']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/type" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/city" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">city</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/state" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">state</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/postal-code" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">postal-code</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/address/country" -->
-      <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">country</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="string" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/party/member-of-organization" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="uuid" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/metadata/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/title" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/description" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/purpose" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">purpose</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/status" -->
-      <assembly name="status" key="status" gi="status">
+      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">status</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/observation/subject" -->
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="*[@key='subject-uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/component/protocol/title" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/description" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence" -->
+      <assembly name="relevant-evidence" gi="relevant-evidence">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='collected']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/collected" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='collected']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component" -->
-      <assembly name="implemented-component" gi="implemented-component">
-         <xsl:apply-templates select="*[@key='component-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-parties']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='expires']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/observation/expires" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">expires</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='expires']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='title']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/title" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='statement']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/statement" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='statement']"
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/method" -->
-      <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="string" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/type" -->
-      <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 mode="get-value-property"
-                 priority="6">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/actor/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -25489,818 +28728,825 @@
          <xsl:apply-templates select="*[@key='subjects']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/subject" -->
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="*[@key='subject-uuid']"/>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/subject/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence" -->
-      <assembly name="relevant-evidence" gi="relevant-evidence">
-         <xsl:apply-templates select="*[@key='href']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/collected" -->
-      <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">collected</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/observation/expires" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">expires</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/statement" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">statement</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 mode="get-value-property"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/actor/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet" -->
+      <assembly name="facet" gi="facet">
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
+         <xsl:apply-templates select="*[@key='value']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor" -->
+      <assembly name="mitigating-factor" gi="mitigating-factor">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='implementation-uuid']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject" -->
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="*[@key='subject-uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='deadline']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/deadline" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">deadline</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='deadline']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+      <!-- XML match="plan-of-action-and-milestones/risk/response" -->
+      <assembly name="response" gi="response">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='lifecycle']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='origins']"/>
+         <xsl:apply-templates select="*[@key='required-assets']"/>
+         <xsl:apply-templates select="*[@key='tasks']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/response/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -26308,1621 +29554,1548 @@
          <xsl:apply-templates select="*[@key='subjects']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet" -->
-      <assembly name="facet" gi="facet">
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='system']"/>
-         <xsl:apply-templates select="*[@key='value']"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset" -->
+      <assembly name="required-asset" gi="required-asset">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor" -->
-      <assembly name="mitigating-factor" gi="mitigating-factor">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='implementation-uuid']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject" -->
+      <assembly name="subject-reference" gi="subject">
+         <xsl:apply-templates select="*[@key='subject-uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject" -->
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="*[@key='subject-uuid']"/>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/deadline" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">deadline</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 mode="get-value-property"
-                 priority="5">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map"
-                 priority="6">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response" -->
-      <assembly name="response" gi="response">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='lifecycle']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='origins']"/>
-         <xsl:apply-templates select="*[@key='required-assets']"/>
-         <xsl:apply-templates select="*[@key='tasks']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/actor/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing" -->
+      <assembly name="timing" key="timing" gi="timing">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">timing</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
+         <xsl:apply-templates select="*[@key='on-date']"/>
+         <xsl:apply-templates select="*[@key='within-date-range']"/>
+         <xsl:apply-templates select="*[@key='at-frequency']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date" -->
+      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">on-date</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='date']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range" -->
+      <assembly as-type="empty"
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">within-date-range</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency" -->
+      <assembly as-type="empty"
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">at-frequency</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='period']"/>
+         <xsl:apply-templates select="*[@key='unit']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency" -->
+      <assembly name="dependency" gi="dependency">
+         <xsl:apply-templates select="*[@key='task-uuid']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity" -->
+      <assembly name="associated-activity" gi="associated-activity">
+         <xsl:apply-templates select="*[@key='activity-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-roles']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset" -->
-      <assembly name="required-asset" gi="required-asset">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject" -->
-      <assembly name="subject-reference" gi="subject">
-         <xsl:apply-templates select="*[@key='subject-uuid']"/>
-         <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log" -->
+      <assembly name="risk-log" key="risk-log" gi="risk-log">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">risk-log</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
+         <xsl:apply-templates select="*[@key='entries']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry" -->
+      <assembly name="entry" gi="entry">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='start']"/>
+         <xsl:apply-templates select="*[@key='end']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='logged-by']"/>
+         <xsl:apply-templates select="*[@key='status-change']"/>
+         <xsl:apply-templates select="*[@key='related-responses']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/start" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="9">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/title" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/end" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing" -->
-      <assembly name="timing" key="timing" gi="timing">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">timing</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='on-date']"/>
-         <xsl:apply-templates select="*[@key='within-date-range']"/>
-         <xsl:apply-templates select="*[@key='at-frequency']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date" -->
-      <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">on-date</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='date']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range" -->
-      <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">within-date-range</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response" -->
+      <assembly name="related-response" gi="related-response">
+         <xsl:apply-templates select="*[@key='response-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='related-tasks']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency" -->
-      <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">at-frequency</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='period']"/>
-         <xsl:apply-templates select="*[@key='unit']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency" -->
-      <assembly name="dependency" gi="dependency">
-         <xsl:apply-templates select="*[@key='task-uuid']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="10">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity" -->
-      <assembly name="associated-activity" gi="associated-activity">
-         <xsl:apply-templates select="*[@key='activity-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='responsible-roles']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/risk/related-observation" -->
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="*[@key='observation-uuid']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='title']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']"
-                 priority="5">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='description']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log" -->
-      <assembly name="risk-log" key="risk-log" gi="risk-log">
+      <!-- XML match="plan-of-action-and-milestones/finding/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">risk-log</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='entries']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry" -->
-      <assembly name="entry" gi="entry">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='start']"/>
-         <xsl:apply-templates select="*[@key='end']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='logged-by']"/>
-         <xsl:apply-templates select="*[@key='status-change']"/>
-         <xsl:apply-templates select="*[@key='related-responses']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/title" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">title</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/description" -->
-      <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/actor/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">description</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="markup-multiline" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/start" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">start</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 priority="8">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/end" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">end</xsl:attribute>
+            <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="dateTime-with-timezone" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map"
-                 priority="9">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response" -->
-      <assembly name="related-response" gi="related-response">
-         <xsl:apply-templates select="*[@key='response-uuid']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='related-tasks']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="12">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject" -->
-      <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+      <!-- XML match="plan-of-action-and-milestones/finding/target/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">identified-subject</xsl:attribute>
+            <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
-         <xsl:apply-templates select="*[@key='subjects']"/>
-      </assembly>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/target/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/target/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
-      <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+      <!-- XML match="plan-of-action-and-milestones/finding/target/status" -->
+      <assembly name="status" key="status" gi="status">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
-      <value as-type="markup-line" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='reason']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/implementation-statement-uuid" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
-            <xsl:attribute name="key">text</xsl:attribute>
+            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
-      <value as-type="markup-line" in-json="string">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="6">
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map"
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="plan-of-action-and-milestones/risk/related-observation" -->
+      <!-- XML match="plan-of-action-and-milestones/finding/related-observation" -->
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/associated-risk" -->
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
+         <xsl:apply-templates select="*[@key='risk-uuid']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -27930,23 +31103,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -27954,22 +31127,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -27977,14 +31150,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='origins']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin" -->
       <assembly name="origin" gi="origin">
@@ -27992,15 +31165,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -28008,14 +31181,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-findings']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/poam-item/related-finding" -->
+      <assembly as-type="empty" name="related-finding" gi="related-finding">
+         <xsl:apply-templates select="*[@key='finding-uuid']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/related-observation" -->
       <assembly as-type="empty" name="related-observation" gi="related-observation">
@@ -28023,7 +31204,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-risks']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk" -->
       <assembly as-type="empty" name="associated-risk" gi="associated-risk">
@@ -28031,7 +31212,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -28047,15 +31228,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -28063,23 +31244,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -28087,33 +31268,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -28126,15 +31307,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -28142,22 +31323,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -28165,14 +31346,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -28182,14 +31363,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -28200,7 +31381,7 @@
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -28214,8 +31395,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -28225,8 +31406,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -28255,15 +31436,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -28294,9 +31475,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -28334,8 +31515,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -28346,7 +31527,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -28365,9 +31546,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -28381,7 +31562,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -28395,9 +31576,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -28576,40 +31757,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_component_json-to-xml-converter.xsl b/xml/convert/oscal_component_json-to-xml-converter.xsl
index e482720c53..d21307ca94 100644
--- a/xml/convert/oscal_component_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_component_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -92,8 +92,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition" -->
       <assembly name="component-definition"
-                key="component-definition"
-                gi="component-definition">
+                 key="component-definition"
+                 gi="component-definition">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">component-definition</xsl:attribute>
          </xsl:if>
@@ -128,6 +128,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -140,6 +141,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -150,64 +152,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -215,8 +185,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="import-component-definition" -->
       <assembly as-type="empty"
-                name="import-component-definition"
-                gi="import-component-definition">
+                 name="import-component-definition"
+                 gi="import-component-definition">
          <xsl:apply-templates select="*[@key='href']"/>
       </assembly>
    </xsl:template>
@@ -312,12 +282,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -325,8 +295,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -335,16 +305,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -353,16 +323,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='party-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -382,549 +352,633 @@
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component-definition/@uuid" -->
+                  priority="1"><!-- XML match="component-definition/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="component-definition/metadata/document-id/@scheme | component-definition/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="component-definition/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="component-definition/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="component-definition/metadata/location/address/@type | component-definition/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="component-definition/metadata/location/telephone-number/@type | component-definition/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="component-definition/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="component-definition/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="component-definition/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="component-definition/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='import-component-definitions']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="import-component-definition/@href" -->
+                  priority="1"><!-- XML match="import-component-definition/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='import-component-definitions']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="defined-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="defined-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-role/@role-id" -->
+                  priority="1"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="protocol/@uuid" -->
+                  priority="1"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="protocol/@name" -->
+                  priority="1"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 priority="1"><!-- XML match="port-range/@start" -->
+                  priority="1"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 priority="1"><!-- XML match="port-range/@end" -->
+                  priority="1"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 priority="1"><!-- XML match="port-range/@transport" -->
+                  priority="1"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid']"
-                 priority="7"><!-- XML match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid" -->
+                  priority="7"><!-- XML match="component-definition/component/control-implementation/@uuid | component-definition/capability/control-implementation/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"><!-- XML match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source" -->
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"
+                  priority="7"><!-- XML match="component-definition/component/control-implementation/@source | component-definition/capability/control-implementation/@source" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="source"
-            key="source"
-            gi="source">
+             as-type="uri-reference"
+             name="source"
+             key="source"
+             gi="source">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='source']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"><!-- XML match="set-parameter/@param-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid" -->
+                  priority="9"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@uuid | component-definition/capability/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/@control-id | component-definition/capability/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@statement-id | component-definition/capability/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 priority="11"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid" -->
+                  priority="11"><!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/@uuid | component-definition/capability/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid'] | j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="capability/@uuid" -->
+                  priority="1"><!-- XML match="capability/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="capability/@name" -->
+                  priority="1"><!-- XML match="capability/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='capabilities']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='incorporates-components']/j:map/j:string[@key='component-uuid']"
-                 priority="1"><!-- XML match="incorporates-component/@component-uuid" -->
+                  priority="1"><!-- XML match="incorporates-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='incorporates-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="component-definition/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="component-definition/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="component-definition/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="component-definition/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="component-definition/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="component-definition/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="component-definition/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="component-definition/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -932,22 +986,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -955,22 +1009,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -978,22 +1032,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1001,22 +1055,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1024,14 +1078,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -1046,14 +1100,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1061,15 +1115,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1077,22 +1131,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1100,22 +1154,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1123,22 +1177,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1146,22 +1200,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1169,22 +1223,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1192,41 +1246,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching component-definition/metadata/document-id-->
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1234,22 +1288,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1257,22 +1325,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1280,23 +1348,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1304,22 +1372,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1327,22 +1395,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1350,14 +1434,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -1373,34 +1457,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1408,22 +1492,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1431,22 +1515,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1454,22 +1538,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1477,79 +1561,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching component-definition/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1557,22 +1642,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -1580,22 +1685,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1603,41 +1708,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching component-definition/metadata/party/external-id-->
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1645,52 +1750,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching component-definition/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -1703,34 +1808,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1738,22 +1843,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1761,22 +1866,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1784,22 +1889,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1807,41 +1912,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1849,22 +1954,68 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="component-definition/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='component-definition']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1872,23 +2023,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1896,22 +2047,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -1919,22 +2070,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1942,22 +2093,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1965,22 +2116,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1988,14 +2139,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation" -->
       <assembly name="control-implementation" gi="control-implementation">
@@ -2009,16 +2160,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2026,22 +2177,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2049,33 +2200,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement" -->
       <assembly name="implemented-requirement" gi="implemented-requirement">
@@ -2091,16 +2242,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2108,22 +2259,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2131,41 +2282,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2173,14 +2324,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement" -->
       <assembly name="statement" gi="statement">
@@ -2194,16 +2345,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2211,22 +2362,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2234,22 +2385,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/component/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2257,23 +2408,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='components']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2281,22 +2432,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2304,23 +2455,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='incorporates-components']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/incorporates-component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2328,14 +2479,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='incorporates-components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation" -->
       <assembly name="control-implementation" gi="control-implementation">
@@ -2349,16 +2500,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2366,22 +2517,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2389,33 +2540,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement" -->
       <assembly name="implemented-requirement" gi="implemented-requirement">
@@ -2431,16 +2582,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2448,22 +2599,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2471,41 +2622,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2513,14 +2664,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement" -->
       <assembly name="statement" gi="statement">
@@ -2534,16 +2685,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2551,22 +2702,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2574,22 +2725,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/capability/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2597,14 +2748,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:array[@key='capabilities']/j:map/j:array[@key='control-implementations']/j:map/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -2620,15 +2771,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2636,23 +2787,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2660,33 +2811,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching component-definition/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -2699,15 +2850,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2715,22 +2866,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2738,14 +2889,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -2755,14 +2906,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="component-definition/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -2773,7 +2924,7 @@
    </xsl:template>
    <!-- matching component-definition/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='component-definition']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -2787,8 +2938,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -2798,8 +2949,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -2828,15 +2979,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -2867,9 +3018,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -2907,8 +3058,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -2919,7 +3070,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -2938,9 +3089,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -2954,7 +3105,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -2968,9 +3119,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -3149,40 +3300,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_mapping_json-to-xml-converter.xsl b/xml/convert/oscal_mapping_json-to-xml-converter.xsl
new file mode 100644
index 0000000000..31b0fa7fb5
--- /dev/null
+++ b/xml/convert/oscal_mapping_json-to-xml-converter.xsl
@@ -0,0 +1,2571 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
+<!-- JSON to XML conversion: pipeline -->
+   <xsl:output indent="true"/>
+   <!-- Processing architecture -->
+   <!-- $file should be a path to the file -->
+   <xsl:param name="file" as="xs:string?"/>
+   <!-- or $json should be a JSON literal -->
+   <xsl:param name="json" as="xs:string?"/>
+   <!-- Pass in $produce=supermodel to produce OSCAL M4 supermodel intermediate format -->
+   <xsl:param name="produce" as="xs:string">xml</xsl:param>
+   <xsl:template name="from-json">
+      <xsl:if test="not(unparsed-text-available($file))" expand-text="true">
+         <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema">No file found at { $file }</nm:ERROR>
+      </xsl:if>
+      <xsl:variable name="source">
+         <xsl:choose>
+            <xsl:when test="matches($json,'\S')"><!-- $json is not empty, so we try it -->
+               <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors" select="json-to-xml($json)">
+                  <xsl:catch expand-text="true">
+                     <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
+                  </xsl:catch>
+               </xsl:try>
+            </xsl:when>
+            <xsl:otherwise>
+               <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
+                         select="unparsed-text($file) ! json-to-xml(.)">
+                  <xsl:catch expand-text="true">
+                     <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
+                  </xsl:catch>
+               </xsl:try>
+            </xsl:otherwise>
+         </xsl:choose>
+      </xsl:variable>
+      <xsl:call-template name="from-xdm-json-xml">
+         <xsl:with-param name="source" select="$source"/>
+      </xsl:call-template>
+   </xsl:template>
+   <xsl:mode name="cast-md" on-no-match="shallow-copy"/>
+   <xsl:template match="/">
+      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema">Error in XSLT invocation - an initial template (-it) is expected ('from-json' or 'from-xdm-json-xml'), but none is given</nm:ERROR>
+   </xsl:template>
+   <xsl:template name="from-xdm-json-xml" expand-text="true">
+      <xsl:param name="source">
+         <xsl:choose><!-- evaluating $file as URI (absolute or relative to stylesheet)-->
+            <xsl:when test="exists($file)">
+               <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors" select="document($file)">
+                  <xsl:catch expand-text="true">
+                     <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{ $err:description }</nm:ERROR>
+                  </xsl:catch>
+               </xsl:try>
+            </xsl:when>
+            <xsl:otherwise>
+               <xsl:sequence select="/"/>
+            </xsl:otherwise>
+         </xsl:choose>
+      </xsl:param>
+      <xsl:if test="empty($source/j:map)" expand-text="true">
+         <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema">No XPath (XML) JSON found at { $file } - using syntax of http://www.w3.org/2005/xpath-functions</nm:ERROR>
+      </xsl:if>
+      <xsl:variable name="near-supermodel">
+         <xsl:apply-templates select="$source/*"/>
+      </xsl:variable>
+      <xsl:variable name="supermodel">
+         <xsl:apply-templates select="$near-supermodel/*" mode="cast-md"/>
+      </xsl:variable>
+      <xsl:choose>
+         <xsl:when test="$produce = 'supermodel'">
+            <xsl:sequence select="$supermodel"/>
+         </xsl:when>
+         <xsl:otherwise>
+            <xsl:apply-templates select="$supermodel" mode="write-xml"/>
+         </xsl:otherwise>
+      </xsl:choose>
+   </xsl:template>
+   <xsl:template match="/j:map[empty(@key)]" priority="10">
+      <xsl:apply-templates/>
+   </xsl:template>
+   <!-- JSON to XML conversion: object filters -->
+   <xsl:strip-space elements="j:map j:array"/>
+   <!-- METASCHEMA conversion stylesheet supports JSON -> METASCHEMA/SUPERMODEL conversion -->
+   <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -->
+   <!-- METASCHEMA:  in namespace "http://csrc.nist.gov/ns/oscal/1.0"-->
+   <xsl:template match="j:map[@key='mapping-collection']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection" -->
+      <assembly name="mapping-collection"
+                 key="mapping-collection"
+                 gi="mapping-collection">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping-collection</xsl:attribute>
+         </xsl:if>
+         <xsl:if test=".. is /j:map">
+            <xsl:attribute name="namespace">http://csrc.nist.gov/ns/oscal/1.0</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='metadata']"/>
+         <xsl:apply-templates select="*[@key='mappings']"/>
+         <xsl:apply-templates select="*[@key='back-matter']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='metadata']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="metadata" -->
+      <assembly name="metadata" key="metadata" gi="metadata">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">metadata</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
+         <xsl:apply-templates select="*[@key='revisions']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='roles']"/>
+         <xsl:apply-templates select="*[@key='locations']"/>
+         <xsl:apply-templates select="*[@key='parties']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="prop" -->
+      <assembly name="property" gi="prop">
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='ns']"/>
+         <xsl:apply-templates select="*[@key='value']"/>
+         <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="link" -->
+      <assembly name="link" gi="link">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='rel']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
+         <xsl:apply-templates select="*[@key='text']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="(j:array[@key='mappings']/j:map | j:map[@key='mappings'])">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping" -->
+      <assembly name="mapping" gi="mapping" key="mapping">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">mapping</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='source-resource']"/>
+         <xsl:apply-templates select="*[@key='target-resource']"/>
+         <xsl:apply-templates select="*[@key='maps']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='source-resource']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="source-resource" -->
+      <assembly name="mapping-resource-reference"
+                 key="source-resource"
+                 gi="source-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">source-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target-resource']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="target-resource" -->
+      <assembly name="mapping-resource-reference"
+                 key="target-resource"
+                 gi="target-resource">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target-resource</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="map" -->
+      <assembly name="map" gi="map">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='relationship']"/>
+         <xsl:apply-templates select="*[@key='sources']"/>
+         <xsl:apply-templates select="*[@key='targets']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="source" -->
+      <assembly name="mapping-item" gi="source">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='id-ref']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:array[@key='targets']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="target" -->
+      <assembly name="mapping-item" gi="target">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='id-ref']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='back-matter']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="back-matter" -->
+      <assembly name="back-matter" key="back-matter" gi="back-matter">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">back-matter</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='resources']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:string[@key='remarks']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="remarks" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">remarks</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:string[@key='remarks']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:array[@key='location-uuids']/j:string">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="location-uuid" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:array[@key='location-uuids']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:array[@key='party-uuids']/j:string">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="party-uuid" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:array[@key='party-uuids']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:array[@key='hashes']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="hash" -->
+      <field collapsible="no" as-type="string" name="hash" gi="hash">
+         <xsl:apply-templates select="*[@key='algorithm']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching hash-->
+   <xsl:template match="j:array[@key='hashes']/j:map" mode="get-value-property">
+      <value as-type="string" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="mapping-collection/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
+      <flag in-json="string"
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
+      <flag in-json="string"
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
+      <flag in-json="string"
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
+      <flag in-json="string"
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
+                  priority="6"><!-- XML match="mapping-collection/metadata/document-id/@scheme | mapping-collection/back-matter/resource/document-id/@scheme" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="mapping-collection/metadata/role/@id" -->
+      <flag in-json="string" as-type="token" name="id" key="id" gi="id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="mapping-collection/metadata/location/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="mapping-collection/metadata/location/address/@type | mapping-collection/metadata/party/address/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
+                  priority="8"><!-- XML match="mapping-collection/metadata/location/telephone-number/@type | mapping-collection/metadata/party/telephone-number/@type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="mapping-collection/metadata/party/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="mapping-collection/metadata/party/@type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
+                  priority="8"><!-- XML match="mapping-collection/metadata/party/external-id/@scheme" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
+      <flag in-json="string"
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="mapping/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='source-resource']/j:string[@key='type'] | j:map[@key='target-resource']/j:string[@key='type']"
+                  priority="1"><!-- XML match="source-resource/@type | target-resource/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='source-resource']/j:string[@key='type'] | j:map[@key='target-resource']/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='source-resource']/j:string[@key='href'] | j:map[@key='target-resource']/j:string[@key='href']"
+                  priority="1"><!-- XML match="source-resource/@href | target-resource/@href" -->
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='source-resource']/j:string[@key='href'] | j:map[@key='target-resource']/j:string[@key='href']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="map/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='maps']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns']"
+                  priority="8"><!-- XML match="mapping-collection/mapping/map/relationship/@ns" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']/j:string[@key='ns']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='type'] | j:array[@key='targets']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="source/@type | target/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='type'] | j:array[@key='targets']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='id-ref'] | j:array[@key='targets']/j:map/j:string[@key='id-ref']"
+                  priority="1"><!-- XML match="source/@id-ref | target/@id-ref" -->
+      <flag in-json="string"
+             as-type="string"
+             name="id-ref"
+             key="id-ref"
+             gi="id-ref">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='sources']/j:map/j:string[@key='id-ref'] | j:array[@key='targets']/j:map/j:string[@key='id-ref']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="mapping-collection/back-matter/resource/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
+                  priority="8"><!-- XML match="mapping-collection/back-matter/resource/rlink/@href" -->
+      <flag in-json="string"
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="mapping-collection/back-matter/resource/rlink/@media-type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
+                  priority="3"><!-- XML match="hash/@algorithm" -->
+      <flag in-json="string"
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
+                  priority="7"><!-- XML match="mapping-collection/back-matter/resource/base64/@filename" -->
+      <flag in-json="string"
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="mapping-collection/back-matter/resource/base64/@media-type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='title']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='published']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/published" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/last-modified" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='version']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="4">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision" -->
+      <assembly name="revision" gi="revision">
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='published']"/>
+         <xsl:apply-templates select="*[@key='last-modified']"/>
+         <xsl:apply-templates select="*[@key='version']"/>
+         <xsl:apply-templates select="*[@key='oscal-version']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']"
+                  priority="4">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions" -->
+      <group in-xml="SHOWN"
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">revisions</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*"/>
+      </group>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision/published" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">published</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision/last-modified" -->
+      <field collapsible="no"
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">last-modified</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="dateTime-with-timezone" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision/version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision/oscal-version" -->
+      <field collapsible="no"
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">oscal-version</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/revisions/revision/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/metadata/document-id-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/role/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/role/short-name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/role/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/address" -->
+      <assembly name="address" key="address" gi="address">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">address</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/address/city" -->
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/address/postal-code" -->
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/address/country" -->
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/email-address" -->
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/metadata/location/telephone-number-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/url" -->
+      <field collapsible="no"
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uri" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/location/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/short-name" -->
+      <field collapsible="no"
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">short-name</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/external-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="external-id"
+              gi="external-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/metadata/party/external-id-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="id" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/email-address" -->
+      <field collapsible="no"
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="email" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/telephone-number" -->
+      <field collapsible="no"
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/metadata/party/telephone-number-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="number" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/address" -->
+      <assembly name="address" gi="address">
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='addr-lines']"/>
+         <xsl:apply-templates select="*[@key='city']"/>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='postal-code']"/>
+         <xsl:apply-templates select="*[@key='country']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/address/addr-line" -->
+      <field collapsible="no"
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/address/city" -->
+      <field collapsible="no"
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">city</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/address/state" -->
+      <field collapsible="no"
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">state</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/address/postal-code" -->
+      <field collapsible="no"
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">postal-code</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/address/country" -->
+      <field collapsible="no"
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">country</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="string" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/party/member-of-organization" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='source-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/mapping/source-resource/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='source-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/mapping/target-resource/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:map[@key='target-resource']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/mapping/map/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/mapping/map/relationship" -->
+      <field collapsible="no"
+              as-type="token"
+              name="relationship"
+              key="relationship"
+              gi="relationship">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">relationship</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='ns']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/mapping/map/relationship-->
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:map[@key='relationship']"
+                  mode="get-value-property">
+      <value as-type="token" key="type" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/mapping/map/source/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='sources']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/mapping/map/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/(j:array[@key='mappings']/j:map | j:map[@key='mappings'])/j:array[@key='maps']/j:map/j:array[@key='targets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource" -->
+      <assembly name="resource" gi="resource">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='document-ids']"/>
+         <xsl:apply-templates select="*[@key='citation']"/>
+         <xsl:apply-templates select="*[@key='rlinks']"/>
+         <xsl:apply-templates select="*[@key='base64']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/document-id" -->
+      <field collapsible="no"
+              as-type="string"
+              name="document-id"
+              gi="document-id">
+         <xsl:apply-templates select="*[@key='scheme']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/back-matter/resource/document-id-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
+                  mode="get-value-property">
+      <value as-type="string" key="identifier" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/citation" -->
+      <assembly name="citation" key="citation" gi="citation">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">citation</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='text']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/citation/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/citation/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/rlink" -->
+      <assembly name="rlink" gi="rlink">
+         <xsl:apply-templates select="*[@key='href']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='hashes']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="mapping-collection/back-matter/resource/base64" -->
+      <field collapsible="no"
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">base64</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='filename']"/>
+         <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <!-- matching mapping-collection/back-matter/resource/base64-->
+   <xsl:template match="j:map[@key='mapping-collection']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
+                  mode="get-value-property">
+      <value as-type="base64Binary" key="value" in-json="string">
+         <xsl:apply-templates mode="keep-value-property"/>
+      </value>
+   </xsl:template>
+   <!-- by default, fields traverse their properties to find a value -->
+   <xsl:template match="*" mode="get-value-property">
+      <xsl:apply-templates mode="keep-value-property"/>
+   </xsl:template>
+   <xsl:template match="*" mode="keep-value-property">
+      <xsl:value-of select="."/>
+   </xsl:template>
+   <!-- JSON to XML conversion: Markdown to markup inferencing -->
+   <xsl:template mode="cast-md"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
+      <xsl:copy>
+         <xsl:copy-of select="@*"/>
+         <!-- if this is valid only a single p comes back but who can tell? -->
+         <xsl:call-template name="parse-markdown-line">
+            <xsl:with-param name="markdown-str" select="string(.)"/>
+         </xsl:call-template>
+      </xsl:copy>
+   </xsl:template>
+   <xsl:template mode="cast-md"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
+      <xsl:copy>
+         <xsl:copy-of select="@*"/>
+         <xsl:call-template name="parse-markdown">
+            <xsl:with-param name="markdown-str" select="string(.)"/>
+         </xsl:call-template>
+      </xsl:copy>
+   </xsl:template>
+   <xsl:template name="parse-markdown-line">
+      <xsl:param name="markdown-str" as="xs:string" required="yes"/>
+      <xsl:variable name="str-as-textnode">
+         <xsl:value-of select="string($markdown-str) =&gt; replace('\\n','&#xA;')"/>
+      </xsl:variable>
+      <xsl:apply-templates select="$str-as-textnode" mode="infer-inlines"/>
+   </xsl:template>
+   <xsl:template name="parse-markdown">
+        
+<!-- First, group according to ``` delimiters btw codeblocks and not
+        within codeblock, escape & and < (only)
+        within not-codeblock split lines at \n\s*\n
+        
+        -->
+        <!-- $str may be passed in, or we can process the current node -->
+      <xsl:param name="markdown-str" as="xs:string" required="yes"/>
+      <xsl:variable name="str" select="string($markdown-str) =&gt; replace('\\n','&#xA;')"/>
+      <xsl:variable name="starts-with-code" select="matches($str,'^```')"/>
+      <!-- Blocks is split between code blocks and everything else -->
+      <xsl:variable name="blocks">
+         <xsl:for-each-group select="tokenize($str, '\n')"
+                              group-starting-with=".[matches(., '^```')]">
+                <!-- odd groups are code if the first one has code, otherwise evens -->
+            <xsl:variable name="this-is-code"
+                           select="not((position() mod 2) + number($starts-with-code))"/>
+            <p><!-- Adding an attribute flag when this is a code block, code='code' -->
+               <xsl:if test="$this-is-code">
+                  <xsl:variable name="language"
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                  <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
+               </xsl:if>
+               <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
+            </p>
+         </xsl:for-each-group>
+      </xsl:variable>
+      <xsl:variable name="rough-blocks">
+         <xsl:apply-templates select="$blocks" mode="parse-block"/>
+      </xsl:variable>
+      <!-- for debugging <xsl:copy-of select="$rough-blocks"/> -->
+      <xsl:variable name="flat-structures">
+         <xsl:apply-templates select="$rough-blocks" mode="mark-structures"/>
+      </xsl:variable>
+      <!-- for debugging <xsl:copy-of select="$flat-structures"/>-->
+      <xsl:variable name="nested-structures">
+         <xsl:apply-templates select="$flat-structures" mode="build-structures"/>
+      </xsl:variable>
+      <!-- for debugging <xsl:copy-of select="$nested-structures"/>-->
+      <xsl:variable name="fully-marked">
+         <xsl:apply-templates select="$nested-structures" mode="infer-inlines"/>
+      </xsl:variable>
+      <xsl:sequence select="$fully-marked"/>
+   </xsl:template>
+   <xsl:template match="*" mode="copy mark-structures build-structures infer-inlines">
+      <xsl:copy>
+         <xsl:copy-of select="@*"/>
+         <xsl:apply-templates mode="#current"/>
+      </xsl:copy>
+   </xsl:template>
+   <xsl:template mode="parse-block"
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
+      <pre>
+         <xsl:for-each select="@code[not(.='code')]">
+            <xsl:attribute name="class">language-{.}</xsl:attribute>
+         </xsl:for-each>
+         <xsl:value-of select="string(.)"/>
+      </pre>
+   </xsl:template>
+   <xsl:template mode="parse-block" match="p" expand-text="true">
+      <xsl:for-each select="tokenize(string(.),'\n\s*\n')[normalize-space(.)]">
+         <p>
+                <!-- trimming leading and trailing whitespace here -->
+            <xsl:value-of select="replace(.,'(^\s*\n|\s+$)','')"/>
+         </p>
+      </xsl:for-each>
+   </xsl:template>
+   <xsl:function name="m:is-table-row-demarcator" as="xs:boolean">
+      <xsl:param name="line" as="xs:string"/>
+      <xsl:sequence select="matches($line,'^[\|\-:\s]+$')"/>
+   </xsl:function>
+   <xsl:function name="m:is-table" as="xs:boolean">
+      <xsl:param name="line" as="element(p)"/>
+      <xsl:variable name="lines" select="tokenize($line,'\s*\n')[matches(.,'\S')]"/>
+      <xsl:sequence select="(every $l in $lines satisfies matches($l,'^\|')) and (some $l in $lines satisfies m:is-table-row-demarcator($l))"/>
+   </xsl:function>
+   <xsl:template mode="mark-structures" priority="5" match="p[m:is-table(.)]">
+      <xsl:variable name="rows">
+         <xsl:for-each select="tokenize(string(.),'\s*\n')">
+            <tr>
+               <xsl:value-of select="."/>
+            </tr>
+         </xsl:for-each>
+      </xsl:variable>
+      <table>
+         <xsl:apply-templates select="$rows/tr" mode="make-row"/>
+      </table>
+   </xsl:template>
+   <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
+                  priority="5"
+                  mode="make-row"/>
+   <xsl:template match="tr" mode="make-row">
+      <tr>
+         <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
+            <td>
+               <xsl:value-of select="."/>
+            </td>
+         </xsl:for-each>
+      </tr>
+   </xsl:template>
+   <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
+                  mode="make-row">
+      <tr>
+         <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
+            <th>
+               <xsl:value-of select="."/>
+            </th>
+         </xsl:for-each>
+      </tr>
+   </xsl:template>
+   <xsl:template mode="mark-structures" match="p[matches(.,'^#')]">
+        <!-- 's' flag is dot-matches-all, so \n does not impede -->
+      <p header-level="{ replace(.,'[^#].*$','','s') ! string-length(.) }">
+         <xsl:value-of select="replace(.,'^#+\s*','') ! replace(.,'\s+$','')"/>
+      </p>
+   </xsl:template>
+   <xsl:variable name="li-regex" as="xs:string">^\s*(\*|\d+\.)\s</xsl:variable>
+   <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
+      <list>
+         <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
+                              select="tokenize(., '\n')">
+            <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+               <xsl:for-each select="current-group()[normalize-space(.)]">
+                  <xsl:if test="not(position() eq 1)">
+                     <br/>
+                  </xsl:if>
+                  <xsl:value-of select="replace(., $li-regex, '')"/>
+               </xsl:for-each>
+            </li>
+         </xsl:for-each-group>
+      </list>
+   </xsl:template>
+   <xsl:template mode="build-structures" match="p[@header-level]">
+      <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
+      <xsl:element name="h{$level}"
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+         <xsl:value-of select="."/>
+      </xsl:element>
+   </xsl:template>
+   <xsl:template mode="build-structures" match="list" name="nest-lists">
+        <!-- Starting at level 0 and grouping  -->
+        <!--        -->
+      <xsl:param name="level" select="0"/>
+      <xsl:param name="group" select="li"/>
+      <xsl:variable name="this-type" select="$group[1]/@type"/>
+      <!--first, splitting ul from ol groups -->
+      <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
+      <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
+      <xsl:element name="{ $group[1]/@type }"
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+         <xsl:for-each-group select="$group"
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+            <xsl:choose>
+               <xsl:when test="@level = $level (: checking first item in group :)">
+                  <li>
+                            <!--<xsl:copy-of select="@level"/>-->
+                     <xsl:apply-templates mode="copy"/>
+                     <xsl:if test="current-group()/@level &gt; $level (: go deeper? :)">
+                        <xsl:call-template name="nest-lists">
+                           <xsl:with-param name="level" select="$level + 1"/>
+                           <xsl:with-param name="group" select="current-group()[@level &gt; $level]"/>
+                        </xsl:call-template>
+                     </xsl:if>
+                  </li>
+               </xsl:when>
+               <xsl:otherwise>
+                        <!-- fallback for skipping levels -->
+                  <li>
+                                <!-- level="{$level}"-->
+                     <xsl:call-template name="nest-lists">
+                        <xsl:with-param name="level" select="$level + 1"/>
+                        <xsl:with-param name="group" select="current-group()"/>
+                     </xsl:call-template>
+                  </li>
+               </xsl:otherwise>
+            </xsl:choose>
+         </xsl:for-each-group>
+      </xsl:element>
+      <!--</xsl:for-each-group>-->
+   </xsl:template>
+   <xsl:template match="pre//text()" mode="infer-inlines">
+      <xsl:copy-of select="."/>
+   </xsl:template>
+   <xsl:template match="text()" mode="infer-inlines">
+      <xsl:variable name="markup">
+         <xsl:apply-templates select="$tag-replacements/rules" mode="replacements">
+            <xsl:with-param name="original" tunnel="yes" as="text()" select="."/>
+         </xsl:apply-templates>
+      </xsl:variable>
+      <xsl:try select="parse-xml-fragment($markup)">
+         <xsl:catch select="."/>
+      </xsl:try>
+   </xsl:template>
+   <xsl:template match="rules" as="xs:string" mode="replacements">
+
+        <!-- Original is only provided for processing text nodes -->
+      <xsl:param name="original" as="text()?" tunnel="yes"/>
+      <xsl:param name="starting" as="xs:string" select="string($original)"/>
+      <xsl:iterate select="*">
+         <xsl:param name="original" select="$original" as="text()?"/>
+         <xsl:param name="str" select="$starting" as="xs:string"/>
+         <xsl:on-completion select="$str"/>
+         <xsl:next-iteration>
+            <xsl:with-param name="str">
+               <xsl:apply-templates select="." mode="replacements">
+                  <xsl:with-param name="str" select="$str"/>
+               </xsl:apply-templates>
+            </xsl:with-param>
+         </xsl:next-iteration>
+      </xsl:iterate>
+   </xsl:template>
+   <xsl:template match="replace" expand-text="true" mode="replacements">
+      <xsl:param name="str" as="xs:string"/>
+      <!--<xsl:value-of>replace({$str},{@match},{string(.)})</xsl:value-of>-->
+      <!-- 's' sets dot-matches-all       -->
+      <xsl:sequence select="replace($str, @match, string(.),'s')"/>
+      <!--<xsl:copy-of select="."/>-->
+   </xsl:template>
+   <xsl:variable name="tag-replacements">
+      <rules>
+            <!-- first, literal replacements -->
+         <replace match="&amp;">&amp;amp;</replace>
+         <replace match="&lt;">&amp;lt;</replace>
+         <!-- next, explicit escape sequences -->
+         <replace match="\\&#34;">&amp;quot;</replace>
+         <!--<replace match="\\&#39;">&amp;apos;</replace>-->
+         <replace match="\\\*">&amp;#x2A;</replace>
+         <replace match="\\`">&amp;#x60;</replace>
+         <replace match="\\~">&amp;#x7E;</replace>
+         <replace match="\\^">&amp;#x5E;</replace>
+         <!-- then, replacements based on $tag-specification -->
+         <xsl:for-each select="$tag-specification/*">
+            <xsl:variable name="match-expr">
+               <xsl:apply-templates select="." mode="write-match"/>
+            </xsl:variable>
+            <xsl:variable name="repl-expr">
+               <xsl:apply-templates select="." mode="write-replace"/>
+            </xsl:variable>
+            <replace match="{$match-expr}">
+               <xsl:sequence select="$repl-expr"/>
+            </replace>
+         </xsl:for-each>
+      </rules>
+   </xsl:variable>
+   <xsl:variable name="tag-specification" as="element()">
+      <tag-spec>
+            <!-- The XML notation represents the substitution by showing both delimiters and tags  -->
+            <!-- Note that text contents are regex notation for matching so * must be \* -->
+         <q>"<text/>"</q>
+         <img alt="!\[{{$noclosebracket}}\]" src="\({{$nocloseparen}}\)"/>
+         <insert>\{\{\s*insert: <type/>,\s*<id-ref/>\s*\}\}</insert>
+         <a href="\[{{$noclosebracket}}\]">\(<text not="\)"/>\)</a>
+         <code>`<text/>`</code>
+         <strong>
+            <em>\*\*\*<text/>\*\*\*</em>
+         </strong>
+         <strong>\*\*<text/>\*\*</strong>
+         <em>\*<text/>\*</em>
+         <sub>~<text/>~</sub>
+         <sup>\^<text/>\^</sup>
+      </tag-spec>
+   </xsl:variable>
+   <xsl:template match="*" mode="write-match">
+      <xsl:apply-templates select="@*, node()" mode="write-match"/>
+   </xsl:template>
+   <xsl:template match="@*[matches(., '\{\$text\}')]" mode="write-match">
+      <xsl:value-of select="replace(., '\{\$text\}', '(.*)?')"/>
+   </xsl:template>
+   <xsl:template match="@*[matches(., '\{\$nocloseparen\}')]" mode="write-match">
+      <xsl:value-of select="replace(., '\{\$nocloseparen\}', '([^\\(]*)?')"/>
+   </xsl:template>
+   <xsl:template match="@*[matches(., '\{\$noclosebracket\}')]" mode="write-match">
+      <xsl:value-of select="replace(., '\{\$noclosebracket\}', '([^\\[]*)?')"/>
+   </xsl:template>
+   <xsl:template match="text" mode="write-match">
+      <xsl:text>(.*?)</xsl:text>
+   </xsl:template>
+   <xsl:template match="insert/type | insert/id-ref" mode="write-match">
+      <xsl:text>(\i\c*?)</xsl:text>
+   </xsl:template>
+   <xsl:template match="text[@not]" mode="write-match">
+      <xsl:text expand-text="true">([^{ @not }]*?)</xsl:text>
+   </xsl:template>
+   <xsl:template match="*" mode="write-replace">
+        <!-- we can write an open/close pair even for an empty element b/c
+             it will be parsed and serialized -->
+      <xsl:text>&lt;</xsl:text>
+      <xsl:value-of select="local-name()"/>
+      <!-- forcing the namespace! -->
+      <xsl:text> xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"</xsl:text>
+      <!-- coercing the order to ensure correct formation of regegex       -->
+      <xsl:apply-templates mode="#current" select="@*"/>
+      <xsl:text>&gt;</xsl:text>
+      <xsl:apply-templates mode="#current" select="*"/>
+      <xsl:text>&lt;/</xsl:text>
+      <xsl:value-of select="local-name()"/>
+      <xsl:text>&gt;</xsl:text>
+   </xsl:template>
+   <xsl:template match="text" mode="write-replace">
+      <xsl:text>$1</xsl:text>
+   </xsl:template>
+   <xsl:template match="insert" mode="write-replace">
+        <!-- we can write an open/close pair even for an empty element b/c
+             it will be parsed and serialized -->
+      <xsl:text>&lt;insert xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"</xsl:text>
+      <!-- coercing the order to ensure correct formation of regegex       -->
+      <xsl:apply-templates mode="#current" select="*"/>
+      <xsl:text>/&gt;</xsl:text>
+   </xsl:template>
+   <xsl:template match="insert/type" mode="write-replace">
+      <xsl:text> type='$1'</xsl:text>
+   </xsl:template>
+   <xsl:template match="insert/id-ref" mode="write-replace">
+      <xsl:text> id-ref='$2'</xsl:text>
+   </xsl:template>
+   <xsl:template match="a/@href" mode="write-replace">
+      <xsl:text> href='$2'</xsl:text>
+      <!--<xsl:value-of select="replace(.,'\{\$insert\}','\$2')"/>-->
+   </xsl:template>
+   <xsl:template match="img/@alt" mode="write-replace">
+      <xsl:text> alt='$1'</xsl:text>
+      <!--<xsl:value-of select="replace(.,'\{\$insert\}','\$2')"/>-->
+   </xsl:template>
+   <xsl:template match="img/@src" mode="write-replace">
+      <xsl:text> src='$2'</xsl:text>
+      <!--<xsl:value-of select="replace(.,'\{\$insert\}','\$2')"/>-->
+   </xsl:template>
+   <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
+   <!-- JSON to XML conversion: Supermodel serialization as XML -->
+   <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                     elements="s:*"/>
+   <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                        elements="s:flag s:value"/>
+   <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+              name="write-xml"/>
+   <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
+      <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
+            <!-- putting flags first in case of disarranged inputs -->
+         <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
+      </xsl:element>
+   </xsl:template>
+   <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
+      <xsl:apply-templates mode="cast-prose"/>
+   </xsl:template>
+   <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+      <xsl:apply-templates select="." mode="cast-prose"/>
+   </xsl:template>
+   <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
+      <xsl:attribute name="{@gi}">
+         <xsl:value-of select="."/>
+      </xsl:attribute>
+   </xsl:template>
+   <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="*"
+                  mode="cast-prose">
+      <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
+         <xsl:copy-of select="@*"/>
+         <xsl:apply-templates mode="#current"/>
+      </xsl:element>
+   </xsl:template>
+</xsl:stylesheet>
diff --git a/xml/convert/oscal_poam_json-to-xml-converter.xsl b/xml/convert/oscal_poam_json-to-xml-converter.xsl
index 162e438c28..cbeecc1af7 100644
--- a/xml/convert/oscal_poam_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_poam_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -92,8 +92,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones" -->
       <assembly name="plan-of-action-and-milestones"
-                key="plan-of-action-and-milestones"
-                gi="plan-of-action-and-milestones">
+                 key="plan-of-action-and-milestones"
+                 gi="plan-of-action-and-milestones">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">plan-of-action-and-milestones</xsl:attribute>
          </xsl:if>
@@ -107,6 +107,7 @@
          <xsl:apply-templates select="*[@key='local-definitions']"/>
          <xsl:apply-templates select="*[@key='observations']"/>
          <xsl:apply-templates select="*[@key='risks']"/>
+         <xsl:apply-templates select="*[@key='findings']"/>
          <xsl:apply-templates select="*[@key='poam-items']"/>
          <xsl:apply-templates select="*[@key='back-matter']"/>
       </assembly>
@@ -131,6 +132,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -143,6 +145,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -153,64 +156,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -229,13 +200,14 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="local-definitions" -->
       <assembly name="local-definitions"
-                key="local-definitions"
-                gi="local-definitions">
+                 key="local-definitions"
+                 gi="local-definitions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">local-definitions</xsl:attribute>
          </xsl:if>
          <xsl:apply-templates select="*[@key='components']"/>
          <xsl:apply-templates select="*[@key='inventory-items']"/>
+         <xsl:apply-templates select="*[@key='assessment-assets']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -299,6 +271,19 @@
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='assessment-assets']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="assessment-assets" -->
+      <assembly name="assessment-assets"
+                 key="assessment-assets"
+                 gi="assessment-assets">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">assessment-assets</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='components']"/>
+         <xsl:apply-templates select="*[@key='assessment-platforms']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="observation" -->
@@ -371,9 +356,9 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
@@ -459,6 +444,54 @@
          <xsl:apply-templates select="*[@key='role-id']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:array[@key='findings']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="finding" -->
+      <assembly name="finding" gi="finding">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='origins']"/>
+         <xsl:apply-templates select="*[@key='target']"/>
+         <xsl:apply-templates select="*[@key='implementation-statement-uuid']"/>
+         <xsl:apply-templates select="*[@key='related-observations']"/>
+         <xsl:apply-templates select="*[@key='related-risks']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="target" -->
+      <assembly name="finding-target" key="target" gi="target">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">target</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='target-id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='status']"/>
+         <xsl:apply-templates select="*[@key='implementation-status']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='implementation-status']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="implementation-status" -->
+      <assembly name="implementation-status"
+                 key="implementation-status"
+                 gi="implementation-status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:array[@key='poam-items']/j:map">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="poam-item" -->
@@ -469,6 +502,7 @@
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='origins']"/>
+         <xsl:apply-templates select="*[@key='related-findings']"/>
          <xsl:apply-templates select="*[@key='related-observations']"/>
          <xsl:apply-templates select="*[@key='related-risks']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
@@ -488,12 +522,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -501,8 +535,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -511,16 +545,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -529,16 +563,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='party-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -547,10 +581,10 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-id"
-             key="system-id"
-             gi="system-id">
+              as-type="string"
+              name="system-id"
+              key="system-id"
+              gi="system-id">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-id</xsl:attribute>
          </xsl:if>
@@ -568,11 +602,11 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status" -->
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status"
-             gi="status"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status"
+              gi="status"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status</xsl:attribute>
          </xsl:if>
@@ -580,8 +614,8 @@
       </field>
    </xsl:template>
    <xsl:template match="(j:map[@key='status'] | j:string[@key='status'])"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -605,11 +639,11 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="status-change" -->
       <field collapsible="no"
-             as-type="token"
-             name="risk-status"
-             key="status-change"
-             gi="status-change"
-             in-json="SCALAR">
+              as-type="token"
+              name="risk-status"
+              key="status-change"
+              gi="status-change"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">status-change</xsl:attribute>
          </xsl:if>
@@ -617,8 +651,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='status-change']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -638,986 +672,1210 @@
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="plan-of-action-and-milestones/@uuid" -->
+                  priority="1"><!-- XML match="plan-of-action-and-milestones/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/document-id/@scheme | plan-of-action-and-milestones/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="plan-of-action-and-milestones/metadata/location/address/@type | plan-of-action-and-milestones/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number/@type | plan-of-action-and-milestones/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="plan-of-action-and-milestones/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="plan-of-action-and-milestones/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="plan-of-action-and-milestones/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']" priority="1"><!-- XML match="import-ssp/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-ssp']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-id']/j:string[@key='identifier-type']"
-                 priority="1"><!-- XML match="system-id/@identifier-type" -->
+                  priority="1"><!-- XML match="system-id/@identifier-type" -->
       <flag in-json="string"
-            as-type="uri"
-            name="identifier-type"
-            key="identifier-type"
-            gi="identifier-type">
+             as-type="uri"
+             name="identifier-type"
+             key="identifier-type"
+             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-id']/j:string[@key='identifier-type']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/local-definitions/component/status/@state" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/local-definitions/component/status/@state | plan-of-action-and-milestones/local-definitions/assessment-assets/component/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state'] | j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-role/@role-id" -->
+                  priority="1"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="protocol/@uuid" -->
+                  priority="1"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="protocol/@name" -->
+                  priority="1"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 priority="1"><!-- XML match="port-range/@start" -->
+                  priority="1"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 priority="1"><!-- XML match="port-range/@end" -->
+                  priority="1"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 priority="1"><!-- XML match="port-range/@transport" -->
+                  priority="1"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="inventory-item/@uuid" -->
+                  priority="1"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 priority="8"><!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid" -->
+                  priority="8"><!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
+                  priority="9"><!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/@component-uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:string[@key='component-uuid']"
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="observation/@uuid" -->
+                  priority="1"><!-- XML match="observation/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='observations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']" priority="1"><!-- XML match="actor/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"
-                 priority="1"><!-- XML match="actor/@actor-uuid" -->
+                  priority="1"><!-- XML match="actor/@actor-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="actor-uuid"
-            key="actor-uuid"
-            gi="actor-uuid">
+             as-type="uuid"
+             name="actor-uuid"
+             key="actor-uuid"
+             gi="actor-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='actor-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="actor/@role-id" -->
+                  priority="1"><!-- XML match="actor/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='actors']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"
-                 priority="1"><!-- XML match="related-task/@task-uuid" -->
+                  priority="1"><!-- XML match="related-task/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='related-tasks']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="subject/@type" -->
+                  priority="1"><!-- XML match="subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="include-subject/@subject-uuid | exclude-subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='subject-uuid'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"><!-- XML match="include-subject/@type | exclude-subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='include-subjects']/j:map/j:string[@key='type'] | j:array[@key='exclude-subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="14"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
-                 priority="10"><!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid" -->
+                  mode="keep-value-property"
+                  priority="14"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
+                  priority="10"><!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/@subject-placeholder-uuid | plan-of-action-and-milestones/finding/origin/related-task/identified-subject/@subject-placeholder-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-placeholder-uuid"
-            key="subject-placeholder-uuid"
-            gi="subject-placeholder-uuid">
+             as-type="uuid"
+             name="subject-placeholder-uuid"
+             key="subject-placeholder-uuid"
+             gi="subject-placeholder-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:string[@key='subject-placeholder-uuid']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"><!-- XML match="plan-of-action-and-milestones/observation/subject/@subject-uuid | plan-of-action-and-milestones/risk/mitigating-factor/subject/@subject-uuid | plan-of-action-and-milestones/risk/response/required-asset/subject/@subject-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="subject-uuid"
-            key="subject-uuid"
-            gi="subject-uuid">
+             as-type="uuid"
+             name="subject-uuid"
+             key="subject-uuid"
+             gi="subject-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='subject-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"><!-- XML match="plan-of-action-and-milestones/observation/subject/@type | plan-of-action-and-milestones/risk/mitigating-factor/subject/@type | plan-of-action-and-milestones/risk/response/required-asset/subject/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="subject-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="subject-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type'] | j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/@href" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="risk/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='risks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"
-                 priority="1"><!-- XML match="threat-id/@system" -->
+                  priority="1"><!-- XML match="threat-id/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="threat-id/@href" -->
+                  priority="1"><!-- XML match="threat-id/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='threat-ids']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name']"
-                 priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@name" -->
+                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system']"
-                 priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@system" -->
+                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value']"
-                 priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@value" -->
+                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/@uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/@implementation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="implementation-uuid"
-            key="implementation-uuid"
-            gi="implementation-uuid">
+             as-type="uuid"
+             name="implementation-uuid"
+             key="implementation-uuid"
+             gi="implementation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='implementation-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/risk/response/@uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/response/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/risk/response/@lifecycle" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/response/@lifecycle" -->
       <flag in-json="string"
-            as-type="token"
-            name="lifecycle"
-            key="lifecycle"
-            gi="lifecycle">
+             as-type="token"
+             name="lifecycle"
+             key="lifecycle"
+             gi="lifecycle">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='lifecycle']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid']"
-                 priority="9"><!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/@uuid" -->
+                  priority="9"><!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="task/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type']" priority="1"><!-- XML match="task/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='tasks']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date/@date" -->
+                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date/@date" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="date"
-            key="date"
-            gi="date">
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']/j:string[@key='date']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start" -->
+                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@start" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="dateTime-with-timezone"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='start']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end" -->
+                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range/@end" -->
       <flag in-json="string"
-            as-type="dateTime-with-timezone"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="dateTime-with-timezone"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']/j:string[@key='end']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period" -->
+                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@period" -->
       <flag in-json="number"
-            as-type="positiveInteger"
-            name="period"
-            key="period"
-            gi="period">
+             as-type="positiveInteger"
+             name="period"
+             key="period"
+             gi="period">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:number[@key='period']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit" -->
+                  priority="12"><!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency/@unit" -->
       <flag in-json="string"
-            as-type="string"
-            name="unit"
-            key="unit"
-            gi="unit">
+             as-type="string"
+             name="unit"
+             key="unit"
+             gi="unit">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']/j:string[@key='unit']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 priority="11"><!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid" -->
+                  priority="11"><!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency/@task-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="task-uuid"
-            key="task-uuid"
-            gi="task-uuid">
+             as-type="uuid"
+             name="task-uuid"
+             key="task-uuid"
+             gi="task-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map/j:string[@key='task-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 priority="11"><!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid" -->
+                  priority="11"><!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/@activity-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="activity-uuid"
-            key="activity-uuid"
-            gi="activity-uuid">
+             as-type="uuid"
+             name="activity-uuid"
+             key="activity-uuid"
+             gi="activity-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:string[@key='activity-uuid']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/@uuid" -->
+                  priority="8"><!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"
-                 priority="1"><!-- XML match="logged-by/@party-uuid" -->
+                  priority="1"><!-- XML match="logged-by/@party-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="party-uuid"
-            key="party-uuid"
-            gi="party-uuid">
+             as-type="uuid"
+             name="party-uuid"
+             key="party-uuid"
+             gi="party-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='party-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="logged-by/@role-id" -->
+                  priority="1"><!-- XML match="logged-by/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='logged-by']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid']"
-                 priority="10"><!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid" -->
+                  priority="10"><!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/@response-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="response-uuid"
-            key="response-uuid"
-            gi="response-uuid">
+             as-type="uuid"
+             name="response-uuid"
+             key="response-uuid"
+             gi="response-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:string[@key='response-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/risk/related-observation/@observation-uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/risk/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="finding/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='findings']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='target']/j:string[@key='type']" priority="1"><!-- XML match="target/@type" -->
+      <flag in-json="string"
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target']/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='target']/j:string[@key='target-id']" priority="1"><!-- XML match="target/@target-id" -->
+      <flag in-json="string"
+             as-type="token"
+             name="target-id"
+             key="target-id"
+             gi="target-id">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='target']/j:string[@key='target-id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/finding/target/status/@state" -->
+      <flag in-json="string"
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='state']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/finding/target/status/@reason" -->
+      <flag in-json="string"
+             as-type="token"
+             name="reason"
+             key="reason"
+             gi="reason">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']/j:string[@key='reason']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
+                  priority="1"><!-- XML match="implementation-status/@state" -->
+      <flag in-json="string"
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/finding/related-observation/@observation-uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/finding/associated-risk/@risk-uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="poam-item/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
    <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="poam-item/@uuid" -->
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-findings']/j:map/j:string[@key='finding-uuid']"
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-finding/@finding-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="finding-uuid"
+             key="finding-uuid"
+             gi="finding-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='poam-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-findings']/j:map/j:string[@key='finding-uuid']"
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/related-observation/@observation-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="observation-uuid"
-            key="observation-uuid"
-            gi="observation-uuid">
+             as-type="uuid"
+             name="observation-uuid"
+             key="observation-uuid"
+             gi="observation-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-observations']/j:map/j:string[@key='observation-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk/@risk-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="risk-uuid"
-            key="risk-uuid"
-            gi="risk-uuid">
+             as-type="uuid"
+             name="risk-uuid"
+             key="risk-uuid"
+             gi="risk-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-risks']/j:map/j:string[@key='risk-uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1625,22 +1883,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1648,22 +1906,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1671,22 +1929,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1694,22 +1952,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1717,14 +1975,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -1739,14 +1997,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1754,15 +2012,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1770,22 +2028,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1793,22 +2051,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1816,22 +2074,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1839,22 +2097,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1862,22 +2120,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1885,41 +2143,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/metadata/document-id-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1927,22 +2185,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1950,22 +2222,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1973,23 +2245,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1997,22 +2269,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2020,22 +2292,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2043,14 +2331,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -2066,34 +2354,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2101,22 +2389,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2124,22 +2412,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2147,22 +2435,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2170,79 +2458,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2250,22 +2539,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2273,22 +2582,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2296,41 +2605,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/metadata/party/external-id-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2338,52 +2647,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -2396,34 +2705,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2431,22 +2740,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2454,22 +2763,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2477,22 +2786,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2500,41 +2809,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2542,22 +2851,68 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2565,23 +2920,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2589,22 +2944,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -2612,22 +2967,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2635,14 +2990,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/status" -->
       <assembly name="status" key="status" gi="status">
@@ -2654,15 +3009,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2670,22 +3025,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2693,23 +3048,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2717,22 +3072,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2740,22 +3095,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2763,14 +3118,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component" -->
       <assembly name="implemented-component" gi="implemented-component">
@@ -2782,15 +3137,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2798,22 +3153,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/local-definitions/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2821,22 +3176,290 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/purpose" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">purpose</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:string[@key='purpose']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:map[@key='status']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/responsible-role/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/component/protocol/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform" -->
+      <assembly name="assessment-platform" gi="assessment-platform">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='uses-components']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component" -->
+      <assembly name="uses-component" gi="uses-component">
+         <xsl:apply-templates select="*[@key='component-uuid']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/local-definitions/assessment-assets/assessment-platform/uses-component/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='local-definitions']/j:map[@key='assessment-assets']/j:array[@key='assessment-platforms']/j:map/j:array[@key='uses-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2844,23 +3467,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2868,22 +3491,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2891,60 +3514,60 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/method" -->
       <field collapsible="no"
-             as-type="string"
-             name="method"
-             gi="method"
-             in-json="SCALAR">
+              as-type="string"
+              name="method"
+              gi="method"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='methods']/j:string"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/type" -->
       <field collapsible="no"
-             as-type="token"
-             name="type"
-             gi="type"
-             in-json="SCALAR">
+              as-type="token"
+              name="type"
+              gi="type"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='types']/j:string"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2952,22 +3575,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2975,22 +3598,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2998,23 +3621,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3022,22 +3645,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3045,22 +3668,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3068,22 +3691,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3091,19 +3714,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -3112,16 +3735,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3129,22 +3752,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3152,22 +3775,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3175,22 +3798,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3198,14 +3821,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject" -->
       <assembly name="subject-reference" gi="subject">
@@ -3218,15 +3841,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3234,22 +3857,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3257,14 +3880,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence" -->
       <assembly name="relevant-evidence" gi="relevant-evidence">
@@ -3276,16 +3899,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3293,22 +3916,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/relevant-evidence/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3316,22 +3939,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:array[@key='relevant-evidence']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/collected" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="collected"
-             key="collected"
-             gi="collected"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="collected"
+              key="collected"
+              gi="collected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">collected</xsl:attribute>
          </xsl:if>
@@ -3339,22 +3962,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='collected']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/observation/expires" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="expires"
-             key="expires"
-             gi="expires"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="expires"
+              key="expires"
+              gi="expires"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expires</xsl:attribute>
          </xsl:if>
@@ -3362,22 +3985,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='observations']/j:map/j:string[@key='expires']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3385,23 +4008,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3409,23 +4032,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/statement" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="statement"
-             key="statement"
-             gi="statement"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="statement"
+              key="statement"
+              gi="statement"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">statement</xsl:attribute>
          </xsl:if>
@@ -3433,22 +4056,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='statement']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3456,22 +4079,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3479,22 +4102,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3502,22 +4125,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3525,23 +4148,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3549,22 +4172,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3572,22 +4195,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3595,22 +4218,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3618,19 +4241,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -3639,16 +4262,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3656,22 +4279,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3679,22 +4302,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3702,22 +4325,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3725,22 +4348,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3748,22 +4371,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3771,22 +4394,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3794,22 +4417,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3817,23 +4440,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3841,22 +4464,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3864,22 +4487,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3887,22 +4510,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3910,19 +4533,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -3931,16 +4554,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3948,22 +4571,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3971,22 +4594,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3994,22 +4617,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4017,14 +4640,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:map[@key='origin']/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet" -->
       <assembly name="facet" gi="facet">
@@ -4037,15 +4660,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/characterization/facet/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4053,14 +4676,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='characterizations']/j:map/j:array[@key='facets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor" -->
       <assembly name="mitigating-factor" gi="mitigating-factor">
@@ -4073,16 +4696,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4090,22 +4713,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4113,14 +4736,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject" -->
       <assembly name="subject-reference" gi="subject">
@@ -4133,15 +4756,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4149,22 +4772,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/mitigating-factor/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4172,22 +4795,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='mitigating-factors']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/deadline" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="deadline"
-             key="deadline"
-             gi="deadline"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="deadline"
+              key="deadline"
+              gi="deadline"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">deadline</xsl:attribute>
          </xsl:if>
@@ -4195,14 +4818,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:string[@key='deadline']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response" -->
       <assembly name="response" gi="response">
@@ -4219,15 +4842,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4235,23 +4858,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4259,22 +4882,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4282,22 +4905,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4305,22 +4928,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4328,22 +4951,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4351,23 +4974,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4375,22 +4998,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4398,22 +5021,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4421,22 +5044,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4444,19 +5067,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -4465,16 +5088,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4482,22 +5105,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4505,22 +5128,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4528,22 +5151,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4551,14 +5174,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset" -->
       <assembly name="required-asset" gi="required-asset">
@@ -4572,7 +5195,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject" -->
       <assembly name="subject-reference" gi="subject">
@@ -4585,15 +5208,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4601,22 +5224,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4624,22 +5247,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4647,23 +5270,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4671,22 +5294,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response/required-asset/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4694,22 +5317,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map/j:array[@key='required-assets']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -4717,23 +5340,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4741,22 +5364,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4764,14 +5387,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing" -->
       <assembly name="timing" key="timing" gi="timing">
@@ -4784,7 +5407,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='on-date']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/on-date" -->
       <assembly as-type="empty" name="on-date" key="on-date" gi="on-date">
@@ -4795,13 +5418,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='within-date-range']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/within-date-range" -->
       <assembly as-type="empty"
-                name="within-date-range"
-                key="within-date-range"
-                gi="within-date-range">
+                 name="within-date-range"
+                 key="within-date-range"
+                 gi="within-date-range">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">within-date-range</xsl:attribute>
          </xsl:if>
@@ -4810,13 +5433,13 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:map[@key='timing']/j:map[@key='at-frequency']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/timing/at-frequency" -->
       <assembly as-type="empty"
-                name="at-frequency"
-                key="at-frequency"
-                gi="at-frequency">
+                 name="at-frequency"
+                 key="at-frequency"
+                 gi="at-frequency">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">at-frequency</xsl:attribute>
          </xsl:if>
@@ -4825,7 +5448,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='dependencies']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/dependency" -->
       <assembly name="dependency" gi="dependency">
@@ -4834,7 +5457,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity" -->
       <assembly name="associated-activity" gi="associated-activity">
@@ -4847,15 +5470,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4863,22 +5486,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4886,23 +5509,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4910,22 +5533,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4933,22 +5556,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4956,22 +5579,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/associated-activity/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4979,23 +5602,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='associated-activities']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5003,22 +5626,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5026,22 +5649,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5049,22 +5672,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5072,22 +5695,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/response//task/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5095,14 +5718,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='remediations']/j:map//j:array[@key='tasks']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log" -->
       <assembly name="risk-log" key="risk-log" gi="risk-log">
@@ -5113,7 +5736,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry" -->
       <assembly name="entry" gi="entry">
@@ -5131,15 +5754,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5147,23 +5770,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5171,22 +5794,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/start" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="start"
-             key="start"
-             gi="start"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="start"
+              key="start"
+              gi="start"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">start</xsl:attribute>
          </xsl:if>
@@ -5194,22 +5817,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='start']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/end" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="end"
-             key="end"
-             gi="end"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="end"
+              key="end"
+              gi="end"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">end</xsl:attribute>
          </xsl:if>
@@ -5217,22 +5840,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:string[@key='end']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5240,14 +5863,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response" -->
       <assembly name="related-response" gi="related-response">
@@ -5259,15 +5882,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5275,22 +5898,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5298,22 +5921,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5321,23 +5944,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5345,22 +5968,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5368,22 +5991,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5391,22 +6014,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="18">
+                  priority="18">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5414,19 +6037,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="18">
+                  mode="get-value-property"
+                  priority="18">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject" -->
       <assembly name="identified-subject"
-                key="identified-subject"
-                gi="identified-subject">
+                 key="identified-subject"
+                 gi="identified-subject">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">identified-subject</xsl:attribute>
          </xsl:if>
@@ -5435,16 +6058,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5452,22 +6075,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5475,22 +6098,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="20">
+                  priority="20">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/include-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5498,22 +6121,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="20">
+                  mode="get-value-property"
+                  priority="20">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="19">
+                  priority="19">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/risk-log/entry/related-response/related-task/identified-subject/subject/exclude-subject/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5521,30 +6144,491 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:map[@key='risk-log']/j:array[@key='entries']/j:map/j:array[@key='related-responses']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="19">
+                  mode="get-value-property"
+                  priority="19">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='risks']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/risk/related-observation" -->
       <assembly as-type="empty" name="related-observation" gi="related-observation">
          <xsl:apply-templates select="*[@key='observation-uuid']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='title']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='description']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="7">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/actor/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="11">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="11">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="13">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="13">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/include-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="15">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/subject/exclude-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="15">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']"
+                  priority="9">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject" -->
+      <assembly name="identified-subject"
+                 key="identified-subject"
+                 gi="identified-subject">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">identified-subject</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='subject-placeholder-uuid']"/>
+         <xsl:apply-templates select="*[@key='subjects']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  priority="12">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="12">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="14">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="14">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="17">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/include-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='include-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="17">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="16">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/origin/related-task/identified-subject/subject/exclude-subject/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='origins']/j:map/j:array[@key='related-tasks']/j:map/j:map[@key='identified-subject']/j:array[@key='subjects']/j:map/j:array[@key='exclude-subjects']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="16">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/target/title" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">title</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='title']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/target/description" -->
+      <field in-xml="WITH_WRAPPER"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">description</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:string[@key='description']"
+                  mode="get-value-property"
+                  priority="6">
+      <value as-type="markup-multiline" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/target/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:map[@key='target']/j:map[@key='status']"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/target/status" -->
+      <assembly name="status" key="status" gi="status">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">status</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='state']"/>
+         <xsl:apply-templates select="*[@key='reason']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/implementation-statement-uuid" -->
+      <field collapsible="no"
+              as-type="uuid"
+              name="implementation-statement-uuid"
+              key="implementation-statement-uuid"
+              gi="implementation-statement-uuid"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">implementation-statement-uuid</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:string[@key='implementation-statement-uuid']"
+                  mode="get-value-property"
+                  priority="5">
+      <value as-type="uuid" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-observations']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/related-observation" -->
+      <assembly as-type="empty" name="related-observation" gi="related-observation">
+         <xsl:apply-templates select="*[@key='observation-uuid']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='findings']/j:map/j:array[@key='related-risks']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/finding/associated-risk" -->
+      <assembly as-type="empty" name="associated-risk" gi="associated-risk">
+         <xsl:apply-templates select="*[@key='risk-uuid']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='title']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5552,23 +6636,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5576,22 +6660,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5599,14 +6683,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='origins']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin" -->
       <assembly name="origin" gi="origin">
@@ -5614,15 +6698,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/origin/actor/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5630,14 +6714,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='origins']/j:map/j:array[@key='actors']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-findings']/j:map"
+                  priority="6">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="plan-of-action-and-milestones/poam-item/related-finding" -->
+      <assembly as-type="empty" name="related-finding" gi="related-finding">
+         <xsl:apply-templates select="*[@key='finding-uuid']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-observations']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/related-observation" -->
       <assembly as-type="empty" name="related-observation" gi="related-observation">
@@ -5645,7 +6737,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:array[@key='poam-items']/j:map/j:array[@key='related-risks']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/poam-item/associated-risk" -->
       <assembly as-type="empty" name="associated-risk" gi="associated-risk">
@@ -5653,7 +6745,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -5669,15 +6761,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5685,23 +6777,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5709,33 +6801,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -5748,15 +6840,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5764,22 +6856,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5787,14 +6879,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -5804,14 +6896,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="plan-of-action-and-milestones/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -5822,7 +6914,7 @@
    </xsl:template>
    <!-- matching plan-of-action-and-milestones/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='plan-of-action-and-milestones']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -5836,8 +6928,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -5847,8 +6939,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -5877,15 +6969,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -5916,9 +7008,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -5956,8 +7048,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -5968,7 +7060,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -5987,9 +7079,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -6003,7 +7095,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -6017,9 +7109,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -6198,40 +7290,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_profile_json-to-xml-converter.xsl b/xml/convert/oscal_profile_json-to-xml-converter.xsl
index 0d24dd9c49..6f7f141f79 100644
--- a/xml/convert/oscal_profile_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_profile_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -126,6 +126,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -138,6 +139,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -148,64 +150,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -223,14 +193,21 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="include-all" -->
       <assembly as-type="empty"
-                name="include-all"
-                key="include-all"
-                gi="include-all">
+                 name="include-all"
+                 key="include-all"
+                 gi="include-all">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">include-all</xsl:attribute>
          </xsl:if>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:array[@key='matching']/j:map">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="matching" -->
+      <assembly as-type="empty" name="matching" gi="matching">
+         <xsl:apply-templates select="*[@key='pattern']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='merge']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="merge" -->
@@ -339,39 +316,6 @@
          <xsl:apply-templates select="*[@key='alters']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='alters']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="alter" -->
-      <assembly name="alter" gi="alter">
-         <xsl:apply-templates select="*[@key='control-id']"/>
-         <xsl:apply-templates select="*[@key='removes']"/>
-         <xsl:apply-templates select="*[@key='adds']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="remove" -->
-      <assembly as-type="empty" name="remove" gi="remove">
-         <xsl:apply-templates select="*[@key='by-name']"/>
-         <xsl:apply-templates select="*[@key='by-class']"/>
-         <xsl:apply-templates select="*[@key='by-id']"/>
-         <xsl:apply-templates select="*[@key='by-item-name']"/>
-         <xsl:apply-templates select="*[@key='by-ns']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="add" -->
-      <assembly name="add" gi="add">
-         <xsl:apply-templates select="*[@key='position']"/>
-         <xsl:apply-templates select="*[@key='by-id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='params']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='parts']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='back-matter']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="back-matter" -->
@@ -386,12 +330,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -399,8 +343,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -409,16 +353,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -427,34 +371,52 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='party-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:array[@key='with-ids']/j:string">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="with-id" -->
+      <field collapsible="no"
+              as-type="token"
+              name="with-id"
+              gi="with-id"
+              in-json="SCALAR">
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:array[@key='with-ids']/j:string"
+                  mode="get-value-property"
+                  priority="9">
+      <value as-type="token" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
    <xsl:template match="j:array[@key='values']/j:string">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="value" -->
       <field collapsible="no"
-             as-type="string"
-             name="parameter-value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="parameter-value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -475,618 +437,708 @@
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:string[@key='uuid']" priority="1"><!-- XML match="profile/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="profile/metadata/document-id/@scheme | profile/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="profile/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="profile/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="profile/metadata/location/address/@type | profile/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="profile/metadata/location/telephone-number/@type | profile/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="profile/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="profile/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="profile/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="profile/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='imports']/j:map/j:string[@key='href']"
-                 priority="1"><!-- XML match="import/@href" -->
+                  priority="1"><!-- XML match="import/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='imports']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls']"><!-- XML match="profile/import/include-controls/@with-child-controls | profile/import/exclude-controls/@with-child-controls | profile/merge/custom//group/insert-controls/include-controls/@with-child-controls | profile/merge/custom//group/insert-controls/exclude-controls/@with-child-controls | profile/merge/custom/insert-controls/include-controls/@with-child-controls | profile/merge/custom/insert-controls/exclude-controls/@with-child-controls" -->
       <flag in-json="string"
-            as-type="token"
-            name="with-child-controls"
-            key="with-child-controls"
-            gi="with-child-controls">
+             as-type="token"
+             name="with-child-controls"
+             key="with-child-controls"
+             gi="with-child-controls">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:string[@key='with-child-controls'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:string[@key='with-child-controls']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern']"><!-- XML match="profile/import/include-controls/matching/@pattern | profile/import/exclude-controls/matching/@pattern | profile/merge/custom//group/insert-controls/include-controls/matching/@pattern | profile/merge/custom//group/insert-controls/exclude-controls/matching/@pattern | profile/merge/custom/insert-controls/include-controls/matching/@pattern | profile/merge/custom/insert-controls/exclude-controls/matching/@pattern" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='matching']/j:map/j:string[@key='pattern']"><!-- XML match="matching/@pattern" -->
       <flag in-json="string"
-            as-type="string"
-            name="pattern"
-            key="pattern"
-            gi="pattern">
+             as-type="string"
+             name="pattern"
+             key="pattern"
+             gi="pattern">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern'] | j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map/j:string[@key='pattern']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='matching']/j:map/j:string[@key='pattern']"
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']/j:string[@key='method']"
-                 priority="5"><!-- XML match="profile/merge/combine/@method" -->
+                  priority="5"><!-- XML match="profile/merge/combine/@method" -->
       <flag in-json="string"
-            as-type="string"
-            name="method"
-            key="method"
-            gi="method">
+             as-type="string"
+             name="method"
+             key="method"
+             gi="method">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']/j:string[@key='method']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']" priority="1"><!-- XML match="group/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="group/@class" -->
+                  priority="1"><!-- XML match="group/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='groups']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']" priority="1"><!-- XML match="param/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"
-                 priority="1"><!-- XML match="param/@class" -->
+                  priority="1"><!-- XML match="param/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"
-                 priority="1"><!-- XML match="param/@depends-on" -->
+                  priority="1"><!-- XML match="param/@depends-on" -->
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='params']/j:map/j:string[@key='depends-on']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']" priority="1"><!-- XML match="select/@how-many" -->
       <flag in-json="string"
-            as-type="token"
-            name="how-many"
-            key="how-many"
-            gi="how-many">
+             as-type="token"
+             name="how-many"
+             key="how-many"
+             gi="how-many">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='select']/j:string[@key='how-many']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']" priority="1"><!-- XML match="part/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']" priority="1"><!-- XML match="part/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="part/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']" priority="1"><!-- XML match="part/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='parts']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='insert-controls']/j:map/j:string[@key='order']"
-                 priority="1"><!-- XML match="insert-controls/@order" -->
+                  priority="1"><!-- XML match="insert-controls/@order" -->
       <flag in-json="string"
-            as-type="token"
-            name="order"
-            key="order"
-            gi="order">
+             as-type="token"
+             name="order"
+             key="order"
+             gi="order">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='insert-controls']/j:map/j:string[@key='order']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 priority="6"><!-- XML match="profile/modify/set-parameter/@param-id" -->
+                  priority="6"><!-- XML match="profile/modify/set-parameter/@param-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='class']"
-                 priority="6"><!-- XML match="profile/modify/set-parameter/@class" -->
+                  priority="6"><!-- XML match="profile/modify/set-parameter/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='depends-on']"
-                 priority="6"><!-- XML match="profile/modify/set-parameter/@depends-on" -->
+                  priority="6"><!-- XML match="profile/modify/set-parameter/@depends-on" -->
       <flag in-json="string"
-            as-type="token"
-            name="depends-on"
-            key="depends-on"
-            deprecated="1.0.1"
-            gi="depends-on">
+             as-type="token"
+             name="depends-on"
+             key="depends-on"
+             deprecated="1.0.1"
+             gi="depends-on">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='depends-on']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='alters']/j:map/j:string[@key='control-id']"><!-- XML match="alter/@control-id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:string[@key='control-id']"><!-- XML match="profile/modify/alter/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='alters']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-name']"
-                 priority="1"><!-- XML match="remove/@by-name" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:string[@key='control-id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-name']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-name" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-name"
-            key="by-name"
-            gi="by-name">
+             as-type="token"
+             name="by-name"
+             key="by-name"
+             gi="by-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-class']"
-                 priority="1"><!-- XML match="remove/@by-class" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-name']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-class']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-class" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-class"
-            key="by-class"
-            gi="by-class">
+             as-type="token"
+             name="by-class"
+             key="by-class"
+             gi="by-class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-id']"
-                 priority="1"><!-- XML match="remove/@by-id" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-class']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-id']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
-                 priority="1"><!-- XML match="remove/@by-item-name" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-id']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-item-name" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-item-name"
-            key="by-item-name"
-            gi="by-item-name">
+             as-type="token"
+             name="by-item-name"
+             key="by-item-name"
+             gi="by-item-name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-ns']"
-                 priority="1"><!-- XML match="remove/@by-ns" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-item-name']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-ns']"
+                  priority="8"><!-- XML match="profile/modify/alter/remove/@by-ns" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-ns"
-            key="by-ns"
-            gi="by-ns">
+             as-type="token"
+             name="by-ns"
+             key="by-ns"
+             gi="by-ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='removes']/j:map/j:string[@key='by-ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='position']"
-                 priority="1"><!-- XML match="add/@position" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map/j:string[@key='by-ns']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='position']"
+                  priority="8"><!-- XML match="profile/modify/alter/add/@position" -->
       <flag in-json="string"
-            as-type="token"
-            name="position"
-            key="position"
-            gi="position">
+             as-type="token"
+             name="position"
+             key="position"
+             default="ending"
+             gi="position">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='position']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='by-id']" priority="1"><!-- XML match="add/@by-id" -->
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='position']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='by-id']"
+                  priority="8"><!-- XML match="profile/modify/alter/add/@by-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="by-id"
-            key="by-id"
-            gi="by-id">
+             as-type="token"
+             name="by-id"
+             key="by-id"
+             gi="by-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='adds']/j:map/j:string[@key='by-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='by-id']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="profile/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="profile/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="profile/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="profile/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="profile/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="profile/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="profile/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="profile/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1094,22 +1146,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1117,22 +1169,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1140,22 +1192,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1163,22 +1215,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1186,14 +1238,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -1208,14 +1260,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1223,15 +1275,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1239,22 +1291,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1262,22 +1314,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1285,22 +1337,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1308,22 +1360,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1331,22 +1383,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1354,41 +1406,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching profile/metadata/document-id-->
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1396,22 +1448,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1419,22 +1485,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1442,23 +1508,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1466,22 +1532,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1489,22 +1555,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1512,14 +1594,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -1535,34 +1617,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1570,22 +1652,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1593,22 +1675,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1616,22 +1698,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1639,79 +1721,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching profile/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1719,22 +1802,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -1742,22 +1845,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1765,41 +1868,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching profile/metadata/party/external-id-->
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1807,52 +1910,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching profile/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -1865,34 +1968,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1900,22 +2003,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1923,22 +2026,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1946,22 +2049,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1969,41 +2072,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2011,51 +2114,70 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="7">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/include-controls" -->
-      <assembly name="select-control-by-id" gi="include-controls">
-         <xsl:apply-templates select="*[@key='with-child-controls']"/>
-         <xsl:apply-templates select="*[@key='with-ids']"/>
-         <xsl:apply-templates select="*[@key='matching']"/>
-      </assembly>
+      <!-- XML match="profile/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/include-controls/with-id" -->
+      <!-- XML match="profile/metadata/action/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="9">
-      <value as-type="token" in-json="string">
+   <xsl:template match="j:map[@key='profile']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
+      <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="9">
+   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='include-controls']/j:map"
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/include-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
+      <!-- XML match="profile/import/include-controls" -->
+      <assembly name="select-control-by-id" gi="include-controls">
+         <xsl:apply-templates select="*[@key='with-child-controls']"/>
+         <xsl:apply-templates select="*[@key='with-ids']"/>
+         <xsl:apply-templates select="*[@key='matching']"/>
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/import/exclude-controls" -->
       <assembly name="select-control-by-id" gi="exclude-controls">
@@ -2064,35 +2186,8 @@
          <xsl:apply-templates select="*[@key='matching']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/exclude-controls/with-id" -->
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:array[@key='imports']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="8">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/import/exclude-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='combine']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/combine" -->
       <assembly as-type="empty" name="combine" key="combine" gi="combine">
@@ -2103,7 +2198,7 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='flat']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/flat" -->
       <assembly as-type="empty" name="flat" key="flat" gi="flat">
@@ -2113,15 +2208,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:boolean[@key='as-is']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/as-is" -->
       <field collapsible="no"
-             as-type="boolean"
-             name="as-is"
-             key="as-is"
-             gi="as-is"
-             in-json="SCALAR">
+              as-type="boolean"
+              name="as-is"
+              key="as-is"
+              gi="as-is"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">as-is</xsl:attribute>
          </xsl:if>
@@ -2129,14 +2224,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:boolean[@key='as-is']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="boolean" in-json="boolean">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom" -->
       <assembly name="custom" key="custom" gi="custom">
@@ -2148,15 +2243,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2164,22 +2259,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2187,22 +2282,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2210,23 +2305,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -2234,23 +2329,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2258,14 +2353,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -2274,15 +2369,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2290,65 +2385,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for profile/merge/custom//group/param/guideline-->
    <xsl:template priority="6"
-                 match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2356,22 +2451,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2379,46 +2474,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for profile/merge/custom//group//part-->
    <xsl:template priority="5"
-                 match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2426,14 +2521,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/include-controls" -->
       <assembly name="select-control-by-id" gi="include-controls">
@@ -2442,35 +2537,8 @@
          <xsl:apply-templates select="*[@key='matching']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="15">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/with-id" -->
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="15">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="15">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls" -->
       <assembly name="select-control-by-id" gi="exclude-controls">
@@ -2479,35 +2547,8 @@
          <xsl:apply-templates select="*[@key='matching']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="14">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/with-id" -->
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="14">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']//j:array[@key='groups']/j:map/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="14">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom//group/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/include-controls" -->
       <assembly name="select-control-by-id" gi="include-controls">
@@ -2516,35 +2557,8 @@
          <xsl:apply-templates select="*[@key='matching']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/include-controls/with-id" -->
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="12">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='include-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="12">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/include-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/merge/custom/insert-controls/exclude-controls" -->
       <assembly name="select-control-by-id" gi="exclude-controls">
@@ -2553,35 +2567,8 @@
          <xsl:apply-templates select="*[@key='matching']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/with-id" -->
-      <field collapsible="no"
-             as-type="token"
-             name="with-id"
-             gi="with-id"
-             in-json="SCALAR">
-         <xsl:apply-templates select="." mode="get-value-property"/>
-      </field>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='with-ids']/j:string"
-                 mode="get-value-property"
-                 priority="11">
-      <value as-type="token" in-json="string">
-         <xsl:value-of select="."/>
-      </value>
-   </xsl:template>
-   <xsl:template match="j:map[@key='profile']/j:map[@key='merge']/j:map[@key='custom']/j:array[@key='insert-controls']/j:map/j:array[@key='exclude-controls']/j:map/j:array[@key='matching']/j:map"
-                 priority="11">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="profile/merge/custom/insert-controls/exclude-controls/matching" -->
-      <assembly as-type="empty" name="matching" gi="matching">
-         <xsl:apply-templates select="*[@key='pattern']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter" -->
       <assembly name="set-parameter" gi="set-parameter">
@@ -2599,15 +2586,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2615,22 +2602,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='label']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2638,23 +2625,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='usage']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -2662,23 +2649,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2686,14 +2673,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/test" -->
       <assembly name="test" gi="test">
@@ -2702,15 +2689,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2718,65 +2705,101 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for profile/modify/set-parameter/guideline-->
    <xsl:template priority="4"
-                 match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/set-parameter/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='set-parameters']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter" -->
+      <assembly name="alter" gi="alter">
+         <xsl:apply-templates select="*[@key='control-id']"/>
+         <xsl:apply-templates select="*[@key='removes']"/>
+         <xsl:apply-templates select="*[@key='adds']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='removes']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/remove" -->
+      <assembly as-type="empty" name="remove" gi="remove">
+         <xsl:apply-templates select="*[@key='by-name']"/>
+         <xsl:apply-templates select="*[@key='by-class']"/>
+         <xsl:apply-templates select="*[@key='by-id']"/>
+         <xsl:apply-templates select="*[@key='by-item-name']"/>
+         <xsl:apply-templates select="*[@key='by-ns']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map"
+                  priority="7">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="profile/modify/alter/add" -->
+      <assembly name="add" gi="add">
+         <xsl:apply-templates select="*[@key='position']"/>
+         <xsl:apply-templates select="*[@key='by-id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='params']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='parts']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2784,22 +2807,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2807,22 +2830,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/label" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="label"
-             key="label"
-             gi="label"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="label"
+              key="label"
+              gi="label"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">label</xsl:attribute>
          </xsl:if>
@@ -2830,23 +2853,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='label']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/usage" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="usage"
-             key="usage"
-             gi="usage"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="usage"
+              key="usage"
+              gi="usage"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">usage</xsl:attribute>
          </xsl:if>
@@ -2854,23 +2877,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:string[@key='usage']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2878,14 +2901,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/test" -->
       <assembly name="test" gi="test">
@@ -2894,15 +2917,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/constraint/test/expression" -->
       <field collapsible="no"
-             as-type="string"
-             name="expression"
-             key="expression"
-             gi="expression"
-             in-json="SCALAR">
+              as-type="string"
+              name="expression"
+              key="expression"
+              gi="expression"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">expression</xsl:attribute>
          </xsl:if>
@@ -2910,65 +2933,65 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='constraints']/j:map/j:array[@key='tests']/j:map/j:string[@key='expression']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for profile/modify/alter/add/param/guideline-->
    <xsl:template priority="6"
-                 match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:array[@key='guidelines']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/parameter-guideline/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/parameter-guideline/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/param/select/choice" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="choice"
-             gi="choice"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="choice"
+              gi="choice"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='params']/j:map/j:map[@key='select']/j:array[@key='choice']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2976,22 +2999,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add//part/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2999,46 +3022,46 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <!-- matching markup-multiline value for profile/modify/alter/add//part-->
    <xsl:template priority="5"
-                 match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
+                  match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:string[@key='prose']">
       <field scope="local"
-             _step="prose"
-             _key="prose"
-             _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose"
-             _metaschema-json-id="/assembly/oscal-catalog-common/part/prose"
-             in-xml="UNWRAPPED"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="prose"
-             key="prose"
-             _using-name="prose"
-             _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
-             _in-json-name="prose">
+              _step="prose"
+              _key="prose"
+              _metaschema-xml-id="/assembly/oscal-control-common/part/prose"
+              _metaschema-json-id="/assembly/oscal-control-common/part/prose"
+              in-xml="UNWRAPPED"
+              collapsible="no"
+              as-type="markup-multiline"
+              name="prose"
+              key="prose"
+              _using-name="prose"
+              _in-xml-name="p ul ol pre table h1 h2 h3 h4 h5 h6"
+              _in-json-name="prose">
          <value as-type="markup-multiline"
-                _metaschema-xml-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                _metaschema-json-id="/assembly/oscal-catalog-common/part/prose/PROSE"
-                in-json="string">
+                 _metaschema-xml-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 _metaschema-json-id="/assembly/oscal-control-common/part/prose/PROSE"
+                 in-json="string">
             <xsl:value-of select="."/>
          </value>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/modify/alter/add//part/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3046,14 +3069,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='modify']/j:array[@key='alters']/j:map/j:array[@key='adds']/j:map//j:array[@key='parts']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -3069,15 +3092,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3085,23 +3108,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3109,33 +3132,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching profile/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -3148,15 +3171,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3164,22 +3187,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3187,14 +3210,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -3204,14 +3227,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="profile/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -3222,7 +3245,7 @@
    </xsl:template>
    <!-- matching profile/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='profile']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -3236,8 +3259,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -3247,8 +3270,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -3277,15 +3300,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -3316,9 +3339,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -3356,8 +3379,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -3368,7 +3391,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -3387,9 +3410,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -3403,7 +3426,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -3417,9 +3440,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -3598,40 +3621,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/convert/oscal_ssp_json-to-xml-converter.xsl b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
index d92afdf8f5..d6994978fb 100644
--- a/xml/convert/oscal_ssp_json-to-xml-converter.xsl
+++ b/xml/convert/oscal_ssp_json-to-xml-converter.xsl
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                xmlns:j="http://www.w3.org/2005/xpath-functions"
-                xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-                xmlns:xs="http://www.w3.org/2001/XMLSchema"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                version="3.0"
-                exclude-result-prefixes="#all">
+                 xmlns:j="http://www.w3.org/2005/xpath-functions"
+                 xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                 version="3.0"
+                 exclude-result-prefixes="#all">
 <!-- JSON to XML conversion: pipeline -->
    <xsl:output indent="true"/>
    <!-- Processing architecture -->
@@ -31,7 +31,7 @@
             </xsl:when>
             <xsl:otherwise>
                <xsl:try xmlns:err="http://www.w3.org/2005/xqt-errors"
-                        select="unparsed-text($file) ! json-to-xml(.)">
+                         select="unparsed-text($file) ! json-to-xml(.)">
                   <xsl:catch expand-text="true">
                      <nm:ERROR xmlns:nm="http://csrc.nist.gov/ns/metaschema" code="{ $err:code }">{{ $err:description }}</nm:ERROR>
                   </xsl:catch>
@@ -92,8 +92,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan" -->
       <assembly name="system-security-plan"
-                key="system-security-plan"
-                gi="system-security-plan">
+                 key="system-security-plan"
+                 gi="system-security-plan">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-security-plan</xsl:attribute>
          </xsl:if>
@@ -129,6 +129,7 @@
          <xsl:apply-templates select="*[@key='locations']"/>
          <xsl:apply-templates select="*[@key='parties']"/>
          <xsl:apply-templates select="*[@key='responsible-parties']"/>
+         <xsl:apply-templates select="*[@key='actions']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -141,6 +142,7 @@
          <xsl:apply-templates select="*[@key='ns']"/>
          <xsl:apply-templates select="*[@key='value']"/>
          <xsl:apply-templates select="*[@key='class']"/>
+         <xsl:apply-templates select="*[@key='group']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -151,64 +153,32 @@
          <xsl:apply-templates select="*[@key='href']"/>
          <xsl:apply-templates select="*[@key='rel']"/>
          <xsl:apply-templates select="*[@key='media-type']"/>
+         <xsl:apply-templates select="*[@key='resource-fragment']"/>
          <xsl:apply-templates select="*[@key='text']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="role" -->
-      <assembly name="role" gi="role">
-         <xsl:apply-templates select="*[@key='id']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='description']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map">
+   <xsl:template match="j:array[@key='responsible-parties']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="location" -->
-      <assembly name="location" gi="location">
-         <xsl:apply-templates select="*[@key='uuid']"/>
-         <xsl:apply-templates select="*[@key='title']"/>
-         <xsl:apply-templates select="*[@key='address']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='urls']"/>
+      <!-- XML match="responsible-party" -->
+      <assembly name="responsible-party" gi="responsible-party">
+         <xsl:apply-templates select="*[@key='role-id']"/>
+         <xsl:apply-templates select="*[@key='party-uuids']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map">
+   <xsl:template match="j:array[@key='actions']/j:map">
       <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="party" -->
-      <assembly name="party" gi="party">
+      <!-- XML match="action" -->
+      <assembly name="action" gi="action">
          <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='date']"/>
          <xsl:apply-templates select="*[@key='type']"/>
-         <xsl:apply-templates select="*[@key='name']"/>
-         <xsl:apply-templates select="*[@key='short-name']"/>
-         <xsl:apply-templates select="*[@key='external-ids']"/>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='email-addresses']"/>
-         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
-         <xsl:apply-templates select="*[@key='addresses']"/>
-         <xsl:apply-templates select="*[@key='location-uuids']"/>
-         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
-         <xsl:apply-templates select="*[@key='remarks']"/>
-      </assembly>
-   </xsl:template>
-   <xsl:template match="j:array[@key='responsible-parties']/j:map">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="responsible-party" -->
-      <assembly name="responsible-party" gi="responsible-party">
-         <xsl:apply-templates select="*[@key='role-id']"/>
-         <xsl:apply-templates select="*[@key='party-uuids']"/>
+         <xsl:apply-templates select="*[@key='system']"/>
          <xsl:apply-templates select="*[@key='props']"/>
          <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='responsible-parties']"/>
          <xsl:apply-templates select="*[@key='remarks']"/>
       </assembly>
    </xsl:template>
@@ -227,8 +197,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-characteristics" -->
       <assembly name="system-characteristics"
-                key="system-characteristics"
-                gi="system-characteristics">
+                 key="system-characteristics"
+                 gi="system-characteristics">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-characteristics</xsl:attribute>
          </xsl:if>
@@ -254,8 +224,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-information" -->
       <assembly name="system-information"
-                key="system-information"
-                gi="system-information">
+                 key="system-information"
+                 gi="system-information">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-information</xsl:attribute>
          </xsl:if>
@@ -264,12 +234,56 @@
          <xsl:apply-templates select="*[@key='information-types']"/>
       </assembly>
    </xsl:template>
+   <xsl:template match="j:map[@key='confidentiality-impact']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="confidentiality-impact" -->
+      <assembly name="impact"
+                 key="confidentiality-impact"
+                 gi="confidentiality-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='base']"/>
+         <xsl:apply-templates select="*[@key='selected']"/>
+         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='integrity-impact']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="integrity-impact" -->
+      <assembly name="impact" key="integrity-impact" gi="integrity-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">integrity-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='base']"/>
+         <xsl:apply-templates select="*[@key='selected']"/>
+         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+      </assembly>
+   </xsl:template>
+   <xsl:template match="j:map[@key='availability-impact']">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="availability-impact" -->
+      <assembly name="impact" key="availability-impact" gi="availability-impact">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">availability-impact</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='base']"/>
+         <xsl:apply-templates select="*[@key='selected']"/>
+         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='security-impact-level']">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="security-impact-level" -->
       <assembly name="security-impact-level"
-                key="security-impact-level"
-                gi="security-impact-level">
+                 key="security-impact-level"
+                 gi="security-impact-level">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-impact-level</xsl:attribute>
          </xsl:if>
@@ -282,8 +296,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="authorization-boundary" -->
       <assembly name="authorization-boundary"
-                key="authorization-boundary"
-                gi="authorization-boundary">
+                 key="authorization-boundary"
+                 gi="authorization-boundary">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">authorization-boundary</xsl:attribute>
          </xsl:if>
@@ -310,8 +324,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="network-architecture" -->
       <assembly name="network-architecture"
-                key="network-architecture"
-                gi="network-architecture">
+                 key="network-architecture"
+                 gi="network-architecture">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">network-architecture</xsl:attribute>
          </xsl:if>
@@ -340,8 +354,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-implementation" -->
       <assembly name="system-implementation"
-                key="system-implementation"
-                gi="system-implementation">
+                 key="system-implementation"
+                 gi="system-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-implementation</xsl:attribute>
          </xsl:if>
@@ -469,8 +483,8 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="implementation-status" -->
       <assembly name="implementation-status"
-                key="implementation-status"
-                gi="implementation-status">
+                 key="implementation-status"
+                 gi="implementation-status">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">implementation-status</xsl:attribute>
          </xsl:if>
@@ -492,12 +506,12 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="remarks" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="remarks"
-             key="remarks"
-             gi="remarks"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="remarks"
+              key="remarks"
+              gi="remarks"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">remarks</xsl:attribute>
          </xsl:if>
@@ -505,8 +519,8 @@
       </field>
    </xsl:template>
    <xsl:template match="j:string[@key='remarks']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -515,16 +529,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="location-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="location-uuid"
-             gi="location-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="location-uuid"
+              gi="location-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='location-uuids']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -533,16 +547,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="(j:array[@key='party-uuids']/j:string | j:string[@key='party-uuid'])"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -551,9 +565,9 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-id"
-             gi="system-id">
+              as-type="string"
+              name="system-id"
+              gi="system-id">
          <xsl:apply-templates select="*[@key='identifier-type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
@@ -568,16 +582,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="role-id" -->
       <field collapsible="no"
-             as-type="token"
-             name="role-id"
-             gi="role-id"
-             in-json="SCALAR">
+              as-type="token"
+              name="role-id"
+              gi="role-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='role-ids']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="token" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -586,16 +600,16 @@
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="function-performed" -->
       <field collapsible="no"
-             as-type="string"
-             name="function-performed"
-             gi="function-performed"
-             in-json="SCALAR">
+              as-type="string"
+              name="function-performed"
+              gi="function-performed"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:array[@key='functions-performed']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
@@ -615,740 +629,823 @@
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="system-security-plan/@uuid" -->
+                  priority="1"><!-- XML match="system-security-plan/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="3"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="3"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']" priority="1"><!-- XML match="prop/@name" -->
       <flag in-json="string"
-            as-type="token"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="token"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="prop/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']" priority="1"><!-- XML match="prop/@ns" -->
-      <flag in-json="string" as-type="uri" name="ns" key="ns" gi="ns">
+      <flag in-json="string"
+             as-type="uri"
+             name="ns"
+             key="ns"
+             default="http://csrc.nist.gov/ns/oscal"
+             gi="ns">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='ns']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']" priority="1"><!-- XML match="prop/@value" -->
       <flag in-json="string"
-            as-type="string"
-            name="value"
-            key="value"
-            gi="value">
+             as-type="string"
+             name="value"
+             key="value"
+             gi="value">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='value']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']" priority="1"><!-- XML match="prop/@class" -->
       <flag in-json="string"
-            as-type="token"
-            name="class"
-            key="class"
-            gi="class">
+             as-type="token"
+             name="class"
+             key="class"
+             gi="class">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='props']/j:map/j:string[@key='class']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']" priority="1"><!-- XML match="prop/@group" -->
+      <flag in-json="string"
+             as-type="token"
+             name="group"
+             key="group"
+             gi="group">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='props']/j:map/j:string[@key='group']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']" priority="1"><!-- XML match="link/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']" priority="1"><!-- XML match="link/@rel" -->
       <flag in-json="string"
-            as-type="token"
-            name="rel"
-            key="rel"
-            gi="rel">
+             as-type="token"
+             name="rel"
+             key="rel"
+             gi="rel">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='rel']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"><!-- XML match="link/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='links']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  priority="1"><!-- XML match="link/@resource-fragment" -->
+      <flag in-json="string"
+             as-type="string"
+             name="resource-fragment"
+             key="resource-fragment"
+             gi="resource-fragment">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='links']/j:map/j:string[@key='resource-fragment']"
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 priority="6"><!-- XML match="system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme" -->
+                  priority="6"><!-- XML match="system-security-plan/metadata/document-id/@scheme | system-security-plan/back-matter/resource/document-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map/j:string[@key='scheme'] | j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']" priority="1"><!-- XML match="role/@id" -->
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  priority="6"><!-- XML match="system-security-plan/metadata/role/@id" -->
       <flag in-json="string" as-type="token" name="id" key="id" gi="id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='roles']/j:map/j:string[@key='id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="location/@uuid" -->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='id']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="system-security-plan/metadata/location/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='locations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"><!-- XML match="system-security-plan/metadata/location/address/@type | system-security-plan/metadata/party/address/@type" -->
       <flag in-json="string"
-            as-type="token"
-            name="location-type"
-            key="type"
-            gi="type">
+             as-type="token"
+             name="location-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 priority="8"><!-- XML match="system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type" -->
+                  priority="8"><!-- XML match="system-security-plan/metadata/location/telephone-number/@type | system-security-plan/metadata/party/telephone-number/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type'] | j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="party/@uuid" -->
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  priority="6"><!-- XML match="system-security-plan/metadata/party/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 priority="1"><!-- XML match="party/@type" -->
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  priority="6"><!-- XML match="system-security-plan/metadata/party/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
-   <xsl:template match="j:array[@key='parties']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 priority="8"><!-- XML match="system-security-plan/metadata/party/external-id/@scheme" -->
+                  priority="8"><!-- XML match="system-security-plan/metadata/party/external-id/@scheme" -->
       <flag in-json="string"
-            as-type="uri"
-            name="scheme"
-            key="scheme"
-            gi="scheme">
+             as-type="uri"
+             name="scheme"
+             key="scheme"
+             gi="scheme">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map/j:string[@key='scheme']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-party/@role-id" -->
+                  priority="1"><!-- XML match="responsible-party/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-parties']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  priority="1"><!-- XML match="action/@uuid" -->
+      <flag in-json="string"
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='uuid']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  priority="1"><!-- XML match="action/@date" -->
+      <flag in-json="string"
+             as-type="dateTime-with-timezone"
+             name="date"
+             key="date"
+             gi="date">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='date']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  priority="1"><!-- XML match="action/@type" -->
+      <flag in-json="string"
+             as-type="token"
+             name="type"
+             key="type"
+             gi="type">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='type']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  priority="1"><!-- XML match="action/@system" -->
+      <flag in-json="string"
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
+         <xsl:value-of select="."/>
+      </flag>
+   </xsl:template>
+   <xsl:template match="j:array[@key='actions']/j:map/j:string[@key='system']"
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='import-profile']/j:string[@key='href']" priority="1"><!-- XML match="import-profile/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='import-profile']/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="4"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="4"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='system-ids']/j:map/j:string[@key='identifier-type']"
-                 priority="1"><!-- XML match="system-id/@identifier-type" -->
+                  priority="1"><!-- XML match="system-id/@identifier-type" -->
       <flag in-json="string"
-            as-type="uri"
-            name="identifier-type"
-            key="identifier-type"
-            gi="identifier-type">
+             as-type="uri"
+             name="identifier-type"
+             key="identifier-type"
+             gi="identifier-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='system-ids']/j:map/j:string[@key='identifier-type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='uuid']"
-                 priority="7"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/@uuid" -->
+                  priority="7"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:string[@key='system']"
-                 priority="9"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system" -->
+                  priority="9"><!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/@system" -->
       <flag in-json="string"
-            as-type="uri"
-            name="system"
-            key="system"
-            gi="system">
+             as-type="uri"
+             name="system"
+             key="system"
+             gi="system">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:string[@key='system']"
-                 mode="keep-value-property"
-                 priority="9"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="9"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']/j:string[@key='state']"
-                 priority="5"><!-- XML match="system-security-plan/system-characteristics/status/@state" -->
+                  priority="5"><!-- XML match="system-security-plan/system-characteristics/status/@state" -->
       <flag in-json="string"
-            as-type="string"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="string"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="5"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="5"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='diagrams']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="diagram/@uuid" -->
+                  priority="1"><!-- XML match="diagram/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='diagrams']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="system-security-plan/system-implementation/leveraged-authorization/@uuid" -->
+                  priority="6"><!-- XML match="system-security-plan/system-implementation/leveraged-authorization/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']" priority="1"><!-- XML match="user/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='users']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="component/@uuid" -->
+                  priority="1"><!-- XML match="component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"><!-- XML match="component/@type" -->
       <flag in-json="string"
-            as-type="string"
-            name="system-component-type"
-            key="type"
-            gi="type">
+             as-type="string"
+             name="system-component-type"
+             key="type"
+             gi="type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='components']/j:map/j:string[@key='type']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 priority="7"><!-- XML match="system-security-plan/system-implementation/component/status/@state" -->
+                  priority="7"><!-- XML match="system-security-plan/system-implementation/component/status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 priority="1"><!-- XML match="responsible-role/@role-id" -->
+                  priority="1"><!-- XML match="responsible-role/@role-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="role-id"
-            key="role-id"
-            gi="role-id">
+             as-type="token"
+             name="role-id"
+             key="role-id"
+             gi="role-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='responsible-roles']/j:map/j:string[@key='role-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="protocol/@uuid" -->
+                  priority="1"><!-- XML match="protocol/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 priority="1"><!-- XML match="protocol/@name" -->
+                  priority="1"><!-- XML match="protocol/@name" -->
       <flag in-json="string"
-            as-type="string"
-            name="name"
-            key="name"
-            gi="name">
+             as-type="string"
+             name="name"
+             key="name"
+             gi="name">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='protocols']/j:map/j:string[@key='name']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 priority="1"><!-- XML match="port-range/@start" -->
+                  priority="1"><!-- XML match="port-range/@start" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="start"
-            key="start"
-            gi="start">
+             as-type="nonNegativeInteger"
+             name="start"
+             key="start"
+             gi="start">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='start']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 priority="1"><!-- XML match="port-range/@end" -->
+                  priority="1"><!-- XML match="port-range/@end" -->
       <flag in-json="number"
-            as-type="nonNegativeInteger"
-            name="end"
-            key="end"
-            gi="end">
+             as-type="nonNegativeInteger"
+             name="end"
+             key="end"
+             gi="end">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:number[@key='end']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 priority="1"><!-- XML match="port-range/@transport" -->
+                  priority="1"><!-- XML match="port-range/@transport" -->
       <flag in-json="string"
-            as-type="token"
-            name="transport"
-            key="transport"
-            gi="transport">
+             as-type="token"
+             name="transport"
+             key="transport"
+             gi="transport">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='port-ranges']/j:map/j:string[@key='transport']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="inventory-item/@uuid" -->
+                  priority="1"><!-- XML match="inventory-item/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='inventory-items']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 priority="8"><!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid" -->
+                  priority="8"><!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"><!-- XML match="set-parameter/@param-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="param-id"
-            key="param-id"
-            gi="param-id">
+             as-type="token"
+             name="param-id"
+             key="param-id"
+             gi="param-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='set-parameters']/j:map/j:string[@key='param-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@uuid" -->
+                  priority="6"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/@control-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="control-id"
-            key="control-id"
-            gi="control-id">
+             as-type="token"
+             name="control-id"
+             key="control-id"
+             gi="control-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:string[@key='control-id']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@statement-id" -->
       <flag in-json="string"
-            as-type="token"
-            name="statement-id"
-            key="statement-id"
-            gi="statement-id">
+             as-type="token"
+             name="statement-id"
+             key="statement-id"
+             gi="statement-id">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='statement-id']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 priority="8"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid" -->
+                  priority="8"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='component-uuid']"
-                 priority="1"><!-- XML match="by-component/@component-uuid" -->
+                  priority="1"><!-- XML match="by-component/@component-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="component-uuid"
-            key="component-uuid"
-            gi="component-uuid">
+             as-type="uuid"
+             name="component-uuid"
+             key="component-uuid"
+             gi="component-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='component-uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='uuid']"
-                 priority="1"><!-- XML match="by-component/@uuid" -->
+                  priority="1"><!-- XML match="by-component/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='by-components']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
-                 priority="1"><!-- XML match="implementation-status/@state" -->
+                  priority="1"><!-- XML match="implementation-status/@state" -->
       <flag in-json="string"
-            as-type="token"
-            name="state"
-            key="state"
-            gi="state">
+             as-type="token"
+             name="state"
+             key="state"
+             gi="state">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='implementation-status']/j:string[@key='state']"
-                 mode="keep-value-property"
-                 priority="11"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="11"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid']"
-                 priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid" -->
+                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="13"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="13"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid']"
-                 priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid" -->
+                  priority="13"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="13"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="13"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/@provided-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='provided-uuid']"
-                 mode="keep-value-property"
-                 priority="13"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="13"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid']"
-                 priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid" -->
+                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/@provided-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/inherited/@provided-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="provided-uuid"
-            key="provided-uuid"
-            gi="provided-uuid">
+             as-type="uuid"
+             name="provided-uuid"
+             key="provided-uuid"
+             gi="provided-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='provided-uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid']"
-                 priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid" -->
+                  priority="12"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid']"><!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/@responsibility-uuid | system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/@responsibility-uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="responsibility-uuid"
-            key="responsibility-uuid"
-            gi="responsibility-uuid">
+             as-type="uuid"
+             name="responsibility-uuid"
+             key="responsibility-uuid"
+             gi="responsibility-uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid'] | j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='responsibility-uuid']"
-                 mode="keep-value-property"
-                 priority="12"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="12"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 priority="6"><!-- XML match="system-security-plan/back-matter/resource/@uuid" -->
+                  priority="6"><!-- XML match="system-security-plan/back-matter/resource/@uuid" -->
       <flag in-json="string"
-            as-type="uuid"
-            name="uuid"
-            key="uuid"
-            gi="uuid">
+             as-type="uuid"
+             name="uuid"
+             key="uuid"
+             gi="uuid">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='uuid']"
-                 mode="keep-value-property"
-                 priority="6"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="6"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 priority="8"><!-- XML match="system-security-plan/back-matter/resource/rlink/@href" -->
+                  priority="8"><!-- XML match="system-security-plan/back-matter/resource/rlink/@href" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="href"
-            key="href"
-            gi="href">
+             as-type="uri-reference"
+             name="href"
+             key="href"
+             gi="href">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='href']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"><!-- XML match="system-security-plan/back-matter/resource/rlink/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="8"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="8"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 priority="3"><!-- XML match="hash/@algorithm" -->
+                  priority="3"><!-- XML match="hash/@algorithm" -->
       <flag in-json="string"
-            as-type="string"
-            name="algorithm"
-            key="algorithm"
-            gi="algorithm">
+             as-type="string"
+             name="algorithm"
+             key="algorithm"
+             gi="algorithm">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:array[@key='hashes']/j:map/j:string[@key='algorithm']"
-                 mode="keep-value-property"
-                 priority="10"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="10"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 priority="7"><!-- XML match="system-security-plan/back-matter/resource/base64/@filename" -->
+                  priority="7"><!-- XML match="system-security-plan/back-matter/resource/base64/@filename" -->
       <flag in-json="string"
-            as-type="uri-reference"
-            name="filename"
-            key="filename"
-            gi="filename">
+             as-type="token"
+             name="filename"
+             key="filename"
+             gi="filename">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='filename']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"><!-- XML match="system-security-plan/back-matter/resource/base64/@media-type" -->
       <flag in-json="string"
-            as-type="string"
-            name="media-type"
-            key="media-type"
-            gi="media-type">
+             as-type="string"
+             name="media-type"
+             key="media-type"
+             gi="media-type">
          <xsl:value-of select="."/>
       </flag>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']/j:string[@key='media-type']"
-                 mode="keep-value-property"
-                 priority="7"><!-- Not keeping the flag here. --></xsl:template>
+                  mode="keep-value-property"
+                  priority="7"><!-- Not keeping the flag here. --></xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1356,22 +1453,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1379,22 +1476,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1402,22 +1499,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1425,22 +1522,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1448,14 +1545,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision" -->
       <assembly name="revision" gi="revision">
@@ -1470,14 +1567,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions" -->
       <group in-xml="SHOWN"
-             gi="revisions"
-             group-json="ARRAY"
-             name="revision"
-             key="revisions">
+              gi="revisions"
+              group-json="ARRAY"
+              name="revision"
+              key="revisions">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">revisions</xsl:attribute>
          </xsl:if>
@@ -1485,15 +1582,15 @@
       </group>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1501,22 +1598,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/published" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="published"
-             key="published"
-             gi="published"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="published"
+              key="published"
+              gi="published"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">published</xsl:attribute>
          </xsl:if>
@@ -1524,22 +1621,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='published']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/last-modified" -->
       <field collapsible="no"
-             as-type="dateTime-with-timezone"
-             name="last-modified"
-             key="last-modified"
-             gi="last-modified"
-             in-json="SCALAR">
+              as-type="dateTime-with-timezone"
+              name="last-modified"
+              key="last-modified"
+              gi="last-modified"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">last-modified</xsl:attribute>
          </xsl:if>
@@ -1547,22 +1644,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='last-modified']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="dateTime-with-timezone" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/version" -->
       <field collapsible="no"
-             as-type="string"
-             name="version"
-             key="version"
-             gi="version"
-             in-json="SCALAR">
+              as-type="string"
+              name="version"
+              key="version"
+              gi="version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">version</xsl:attribute>
          </xsl:if>
@@ -1570,22 +1667,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/oscal-version" -->
       <field collapsible="no"
-             as-type="string"
-             name="oscal-version"
-             key="oscal-version"
-             gi="oscal-version"
-             in-json="SCALAR">
+              as-type="string"
+              name="oscal-version"
+              key="oscal-version"
+              gi="oscal-version"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">oscal-version</xsl:attribute>
          </xsl:if>
@@ -1593,22 +1690,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:string[@key='oscal-version']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/revisions/revision/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1616,41 +1713,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='revisions']/j:array[@key='revisions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching system-security-plan/metadata/document-id-->
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1658,22 +1755,36 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/role" -->
+      <assembly name="role" gi="role">
+         <xsl:apply-templates select="*[@key='id']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='description']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1681,22 +1792,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -1704,23 +1815,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -1728,22 +1839,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1751,22 +1862,38 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/location" -->
+      <assembly name="location" gi="location">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='title']"/>
+         <xsl:apply-templates select="*[@key='address']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='urls']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -1774,14 +1901,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address" -->
       <assembly name="address" key="address" gi="address">
@@ -1797,34 +1924,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -1832,22 +1959,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -1855,22 +1982,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -1878,22 +2005,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -1901,79 +2028,80 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:map[@key='address']/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching system-security-plan/metadata/location/telephone-number-->
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/url" -->
       <field collapsible="no"
-             as-type="uri"
-             name="url"
-             gi="url"
-             in-json="SCALAR">
+              as-type="uri"
+              name="url"
+              deprecated="1.1.0"
+              gi="url"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='urls']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uri" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/location/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -1981,22 +2109,42 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='locations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map"
+                  priority="5">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/party" -->
+      <assembly name="party" gi="party">
+         <xsl:apply-templates select="*[@key='uuid']"/>
+         <xsl:apply-templates select="*[@key='type']"/>
+         <xsl:apply-templates select="*[@key='name']"/>
+         <xsl:apply-templates select="*[@key='short-name']"/>
+         <xsl:apply-templates select="*[@key='external-ids']"/>
+         <xsl:apply-templates select="*[@key='props']"/>
+         <xsl:apply-templates select="*[@key='links']"/>
+         <xsl:apply-templates select="*[@key='email-addresses']"/>
+         <xsl:apply-templates select="*[@key='telephone-numbers']"/>
+         <xsl:apply-templates select="*[@key='addresses']"/>
+         <xsl:apply-templates select="*[@key='location-uuids']"/>
+         <xsl:apply-templates select="*[@key='member-of-organizations']"/>
+         <xsl:apply-templates select="*[@key='remarks']"/>
+      </assembly>
+   </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/name" -->
       <field collapsible="no"
-             as-type="string"
-             name="name"
-             key="name"
-             gi="name"
-             in-json="SCALAR">
+              as-type="string"
+              name="name"
+              key="name"
+              gi="name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">name</xsl:attribute>
          </xsl:if>
@@ -2004,22 +2152,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -2027,41 +2175,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/external-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="external-id"
-             gi="external-id">
+              as-type="string"
+              name="external-id"
+              gi="external-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching system-security-plan/metadata/party/external-id-->
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='external-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="id" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2069,52 +2217,52 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/email-address" -->
       <field collapsible="no"
-             as-type="email"
-             name="email-address"
-             gi="email-address"
-             in-json="SCALAR">
+              as-type="email"
+              name="email-address"
+              gi="email-address"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='email-addresses']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="email" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/telephone-number" -->
       <field collapsible="no"
-             as-type="string"
-             name="telephone-number"
-             gi="telephone-number">
+              as-type="string"
+              name="telephone-number"
+              gi="telephone-number">
          <xsl:apply-templates select="*[@key='type']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching system-security-plan/metadata/party/telephone-number-->
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='telephone-numbers']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="number" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address" -->
       <assembly name="address" gi="address">
@@ -2127,34 +2275,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/addr-line" -->
       <field collapsible="no"
-             as-type="string"
-             name="addr-line"
-             gi="addr-line"
-             in-json="SCALAR">
+              as-type="string"
+              name="addr-line"
+              gi="addr-line"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:array[@key='addr-lines']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/city" -->
       <field collapsible="no"
-             as-type="string"
-             name="city"
-             key="city"
-             gi="city"
-             in-json="SCALAR">
+              as-type="string"
+              name="city"
+              key="city"
+              gi="city"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">city</xsl:attribute>
          </xsl:if>
@@ -2162,22 +2310,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='city']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/state" -->
       <field collapsible="no"
-             as-type="string"
-             name="state"
-             key="state"
-             gi="state"
-             in-json="SCALAR">
+              as-type="string"
+              name="state"
+              key="state"
+              gi="state"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">state</xsl:attribute>
          </xsl:if>
@@ -2185,22 +2333,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='state']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/postal-code" -->
       <field collapsible="no"
-             as-type="string"
-             name="postal-code"
-             key="postal-code"
-             gi="postal-code"
-             in-json="SCALAR">
+              as-type="string"
+              name="postal-code"
+              key="postal-code"
+              gi="postal-code"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">postal-code</xsl:attribute>
          </xsl:if>
@@ -2208,22 +2356,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='postal-code']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/address/country" -->
       <field collapsible="no"
-             as-type="string"
-             name="country"
-             key="country"
-             gi="country"
-             in-json="SCALAR">
+              as-type="string"
+              name="country"
+              key="country"
+              gi="country"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">country</xsl:attribute>
          </xsl:if>
@@ -2231,41 +2379,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='addresses']/j:map/j:string[@key='country']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/party/member-of-organization" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="member-of-organization"
-             gi="member-of-organization"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="member-of-organization"
+              gi="member-of-organization"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='parties']/j:map/j:array[@key='member-of-organizations']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/metadata/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2273,22 +2421,68 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="8">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/action/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="8">
+      <value as-type="markup-line" in-json="string">
+         <xsl:value-of select="."/>
+      </value>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  priority="10">
+      <xsl:param name="with-key" select="true()"/>
+      <!-- XML match="system-security-plan/metadata/action/responsible-party/link/text" -->
+      <field collapsible="no"
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
+         <xsl:if test="$with-key">
+            <xsl:attribute name="key">text</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="." mode="get-value-property"/>
+      </field>
+   </xsl:template>
+   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='metadata']/j:array[@key='actions']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-name"
-             key="system-name"
-             gi="system-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="system-name"
+              key="system-name"
+              gi="system-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-name</xsl:attribute>
          </xsl:if>
@@ -2296,22 +2490,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name-short']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-name-short" -->
       <field collapsible="no"
-             as-type="string"
-             name="system-name-short"
-             key="system-name-short"
-             gi="system-name-short"
-             in-json="SCALAR">
+              as-type="string"
+              name="system-name-short"
+              key="system-name-short"
+              gi="system-name-short"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">system-name-short</xsl:attribute>
          </xsl:if>
@@ -2319,23 +2513,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='system-name-short']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='description']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2343,22 +2537,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2366,22 +2560,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='date-authorized']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/date-authorized" -->
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
@@ -2389,22 +2583,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='date-authorized']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="date" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='security-sensitivity-level']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-sensitivity-level" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-sensitivity-level"
-             key="security-sensitivity-level"
-             gi="security-sensitivity-level"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-sensitivity-level"
+              key="security-sensitivity-level"
+              gi="security-sensitivity-level"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-sensitivity-level</xsl:attribute>
          </xsl:if>
@@ -2412,22 +2606,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:string[@key='security-sensitivity-level']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2435,14 +2629,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type" -->
       <assembly name="information-type" gi="information-type">
@@ -2458,15 +2652,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='title']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -2474,23 +2668,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2498,14 +2692,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization" -->
       <assembly name="categorization" gi="categorization">
@@ -2514,34 +2708,34 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:array[@key='information-type-ids']/j:string"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/categorization/information-type-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="information-type-id"
-             gi="information-type-id"
-             in-json="SCALAR">
+              as-type="string"
+              name="information-type-id"
+              gi="information-type-id"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='categorizations']/j:map/j:array[@key='information-type-ids']/j:string"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2549,39 +2743,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact" -->
-      <assembly name="confidentiality-impact"
-                key="confidentiality-impact"
-                gi="confidentiality-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">confidentiality-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='base']"/>
-         <xsl:apply-templates select="*[@key='selected']"/>
-         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2589,22 +2766,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='base']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/base" -->
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
@@ -2612,22 +2789,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='base']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='selected']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/selected" -->
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
@@ -2635,23 +2812,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='selected']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='adjustment-justification']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/confidentiality-impact/adjustment-justification" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
@@ -2659,39 +2836,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='confidentiality-impact']/j:string[@key='adjustment-justification']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact" -->
-      <assembly name="integrity-impact"
-                key="integrity-impact"
-                gi="integrity-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">integrity-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='base']"/>
-         <xsl:apply-templates select="*[@key='selected']"/>
-         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2699,22 +2859,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='base']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/base" -->
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
@@ -2722,22 +2882,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='base']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='selected']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/selected" -->
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
@@ -2745,23 +2905,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='selected']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='adjustment-justification']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/integrity-impact/adjustment-justification" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
@@ -2769,39 +2929,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='integrity-impact']/j:string[@key='adjustment-justification']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
-   <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']"
-                 priority="7">
-      <xsl:param name="with-key" select="true()"/>
-      <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact" -->
-      <assembly name="availability-impact"
-                key="availability-impact"
-                gi="availability-impact">
-         <xsl:if test="$with-key">
-            <xsl:attribute name="key">availability-impact</xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates select="*[@key='props']"/>
-         <xsl:apply-templates select="*[@key='links']"/>
-         <xsl:apply-templates select="*[@key='base']"/>
-         <xsl:apply-templates select="*[@key='selected']"/>
-         <xsl:apply-templates select="*[@key='adjustment-justification']"/>
-      </assembly>
-   </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -2809,22 +2952,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='base']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/base" -->
       <field collapsible="no"
-             as-type="string"
-             name="base"
-             key="base"
-             gi="base"
-             in-json="SCALAR">
+              as-type="string"
+              name="base"
+              key="base"
+              gi="base"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base</xsl:attribute>
          </xsl:if>
@@ -2832,22 +2975,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='base']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='selected']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/selected" -->
       <field collapsible="no"
-             as-type="string"
-             name="selected"
-             key="selected"
-             gi="selected"
-             in-json="SCALAR">
+              as-type="string"
+              name="selected"
+              key="selected"
+              gi="selected"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">selected</xsl:attribute>
          </xsl:if>
@@ -2855,23 +2998,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='selected']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='adjustment-justification']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/system-information/information-type/availability-impact/adjustment-justification" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="adjustment-justification"
-             key="adjustment-justification"
-             gi="adjustment-justification"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="adjustment-justification"
+              key="adjustment-justification"
+              gi="adjustment-justification"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">adjustment-justification</xsl:attribute>
          </xsl:if>
@@ -2879,22 +3022,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='system-information']/j:array[@key='information-types']/j:map/j:map[@key='availability-impact']/j:string[@key='adjustment-justification']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-confidentiality']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-confidentiality" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-confidentiality"
-             key="security-objective-confidentiality"
-             gi="security-objective-confidentiality"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-confidentiality"
+              key="security-objective-confidentiality"
+              gi="security-objective-confidentiality"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-confidentiality</xsl:attribute>
          </xsl:if>
@@ -2902,22 +3045,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-confidentiality']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-integrity']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-integrity" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-integrity"
-             key="security-objective-integrity"
-             gi="security-objective-integrity"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-integrity"
+              key="security-objective-integrity"
+              gi="security-objective-integrity"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-integrity</xsl:attribute>
          </xsl:if>
@@ -2925,22 +3068,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-integrity']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-availability']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/security-impact-level/security-objective-availability" -->
       <field collapsible="no"
-             as-type="string"
-             name="security-objective-availability"
-             key="security-objective-availability"
-             gi="security-objective-availability"
-             in-json="SCALAR">
+              as-type="string"
+              name="security-objective-availability"
+              key="security-objective-availability"
+              gi="security-objective-availability"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">security-objective-availability</xsl:attribute>
          </xsl:if>
@@ -2948,14 +3091,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='security-impact-level']/j:string[@key='security-objective-availability']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='status']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/status" -->
       <assembly name="status" key="status" gi="status">
@@ -2967,16 +3110,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -2984,22 +3127,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3007,23 +3150,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3031,22 +3174,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3054,22 +3197,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/authorization-boundary/diagram/caption" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
@@ -3077,23 +3220,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='authorization-boundary']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3101,22 +3244,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3124,23 +3267,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3148,22 +3291,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3171,22 +3314,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/network-architecture/diagram/caption" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
@@ -3194,23 +3337,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='network-architecture']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:string[@key='description']"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3218,22 +3361,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="5">
+                  mode="get-value-property"
+                  priority="5">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3241,23 +3384,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3265,22 +3408,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3288,22 +3431,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/data-flow/diagram/caption" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="caption"
-             key="caption"
-             gi="caption"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="caption"
+              key="caption"
+              gi="caption"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">caption</xsl:attribute>
          </xsl:if>
@@ -3311,22 +3454,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:map[@key='data-flow']/j:array[@key='diagrams']/j:map/j:string[@key='caption']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-characteristics/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3334,22 +3477,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-characteristics']/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3357,14 +3500,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization" -->
       <assembly name="leveraged-authorization" gi="leveraged-authorization">
@@ -3378,15 +3521,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3394,22 +3537,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3417,22 +3560,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='party-uuid']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/party-uuid" -->
       <field collapsible="no"
-             as-type="uuid"
-             name="party-uuid"
-             key="party-uuid"
-             gi="party-uuid"
-             in-json="SCALAR">
+              as-type="uuid"
+              name="party-uuid"
+              key="party-uuid"
+              gi="party-uuid"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">party-uuid</xsl:attribute>
          </xsl:if>
@@ -3440,22 +3583,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='party-uuid']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="uuid" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='date-authorized']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/leveraged-authorization/date-authorized" -->
       <field collapsible="no"
-             as-type="date"
-             name="date-authorized"
-             key="date-authorized"
-             gi="date-authorized"
-             in-json="SCALAR">
+              as-type="date"
+              name="date-authorized"
+              key="date-authorized"
+              gi="date-authorized"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">date-authorized</xsl:attribute>
          </xsl:if>
@@ -3463,22 +3606,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='leveraged-authorizations']/j:map/j:string[@key='date-authorized']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="date" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3486,22 +3629,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/short-name" -->
       <field collapsible="no"
-             as-type="string"
-             name="short-name"
-             key="short-name"
-             gi="short-name"
-             in-json="SCALAR">
+              as-type="string"
+              name="short-name"
+              key="short-name"
+              gi="short-name"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">short-name</xsl:attribute>
          </xsl:if>
@@ -3509,23 +3652,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='short-name']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3533,22 +3676,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3556,22 +3699,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3579,23 +3722,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/user/authorized-privilege/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3603,22 +3746,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='users']/j:map/j:array[@key='authorized-privileges']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3626,23 +3769,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3650,22 +3793,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/purpose" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="purpose"
-             key="purpose"
-             gi="purpose"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="purpose"
+              key="purpose"
+              gi="purpose"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">purpose</xsl:attribute>
          </xsl:if>
@@ -3673,22 +3816,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:string[@key='purpose']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3696,14 +3839,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:map[@key='status']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/status" -->
       <assembly name="status" key="status" gi="status">
@@ -3715,15 +3858,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3731,22 +3874,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/component/protocol/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -3754,23 +3897,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='components']/j:map/j:array[@key='protocols']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3778,22 +3921,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3801,22 +3944,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3824,14 +3967,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component" -->
       <assembly name="implemented-component" gi="implemented-component">
@@ -3843,15 +3986,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3859,22 +4002,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/system-implementation/inventory-item/implemented-component/responsible-party/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3882,19 +4025,19 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='system-implementation']/j:array[@key='inventory-items']/j:map/j:array[@key='implemented-components']/j:map/j:array[@key='responsible-parties']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']"
-                 priority="3">
+                  priority="3">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation" -->
       <assembly name="control-implementation"
-                key="control-implementation"
-                gi="control-implementation">
+                 key="control-implementation"
+                 gi="control-implementation">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">control-implementation</xsl:attribute>
          </xsl:if>
@@ -3904,16 +4047,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:string[@key='description']"
-                 priority="4">
+                  priority="4">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -3921,33 +4064,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="4">
+                  mode="get-value-property"
+                  priority="4">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement" -->
       <assembly name="implemented-requirement" gi="implemented-requirement">
@@ -3963,15 +4106,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -3979,41 +4122,41 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4021,14 +4164,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement" -->
       <assembly name="statement" gi="statement">
@@ -4042,15 +4185,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4058,22 +4201,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4081,23 +4224,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4105,22 +4248,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4128,33 +4271,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export" -->
       <assembly name="export" key="export" gi="export">
@@ -4170,16 +4313,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4187,22 +4330,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4210,14 +4353,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided" -->
       <assembly name="provided" gi="provided">
@@ -4230,16 +4373,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4247,22 +4390,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4270,22 +4413,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/provided/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4293,14 +4436,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility" -->
       <assembly name="responsibility" gi="responsibility">
@@ -4314,16 +4457,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4331,22 +4474,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4354,22 +4497,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="17">
+                  priority="17">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/export/responsibility/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4377,14 +4520,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="17">
+                  mode="get-value-property"
+                  priority="17">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited" -->
       <assembly name="inherited" gi="inherited">
@@ -4397,16 +4540,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4414,22 +4557,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4437,22 +4580,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/inherited/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4460,14 +4603,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied" -->
       <assembly name="satisfied" gi="satisfied">
@@ -4481,16 +4624,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4498,22 +4641,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4521,22 +4664,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="16">
+                  priority="16">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/satisfied/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4544,22 +4687,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="16">
+                  mode="get-value-property"
+                  priority="16">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/statement/by-component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4567,23 +4710,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='statements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4591,22 +4734,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="8">
+                  mode="get-value-property"
+                  priority="8">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4614,33 +4757,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/set-parameter/value" -->
       <field collapsible="no"
-             as-type="string"
-             name="value"
-             gi="value"
-             in-json="SCALAR">
+              as-type="string"
+              name="value"
+              gi="value"
+              in-json="SCALAR">
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='set-parameters']/j:map/j:array[@key='values']/j:string"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="string" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']"
-                 priority="8">
+                  priority="8">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export" -->
       <assembly name="export" key="export" gi="export">
@@ -4656,16 +4799,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4673,22 +4816,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4696,14 +4839,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided" -->
       <assembly name="provided" gi="provided">
@@ -4716,16 +4859,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4733,22 +4876,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4756,22 +4899,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/provided/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4779,14 +4922,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='provided']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility" -->
       <assembly name="responsibility" gi="responsibility">
@@ -4800,16 +4943,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 priority="11">
+                  priority="11">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4817,22 +4960,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="11">
+                  mode="get-value-property"
+                  priority="11">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="13">
+                  priority="13">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4840,22 +4983,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="13">
+                  mode="get-value-property"
+                  priority="13">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="15">
+                  priority="15">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/export/responsibility/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4863,14 +5006,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:map[@key='export']/j:array[@key='responsibilities']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="15">
+                  mode="get-value-property"
+                  priority="15">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited" -->
       <assembly name="inherited" gi="inherited">
@@ -4883,16 +5026,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4900,22 +5043,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4923,22 +5066,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/inherited/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -4946,14 +5089,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='inherited']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied" -->
       <assembly name="satisfied" gi="satisfied">
@@ -4967,16 +5110,16 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 priority="10">
+                  priority="10">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -4984,22 +5127,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="10">
+                  mode="get-value-property"
+                  priority="10">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5007,22 +5150,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="14">
+                  priority="14">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/satisfied/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5030,22 +5173,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='satisfied']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="14">
+                  mode="get-value-property"
+                  priority="14">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="12">
+                  priority="12">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/control-implementation/implemented-requirement/by-component/responsible-role/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5053,14 +5196,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='control-implementation']/j:array[@key='implemented-requirements']/j:map/j:array[@key='by-components']/j:map/j:array[@key='responsible-roles']/j:map/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="12">
+                  mode="get-value-property"
+                  priority="12">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map"
-                 priority="5">
+                  priority="5">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource" -->
       <assembly name="resource" gi="resource">
@@ -5076,15 +5219,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/title" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="title"
-             key="title"
-             gi="title"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="title"
+              key="title"
+              gi="title"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">title</xsl:attribute>
          </xsl:if>
@@ -5092,23 +5235,23 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='title']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/description" -->
       <field in-xml="WITH_WRAPPER"
-             collapsible="no"
-             as-type="markup-multiline"
-             name="description"
-             key="description"
-             gi="description"
-             in-json="SCALAR">
+              collapsible="no"
+              as-type="markup-multiline"
+              name="description"
+              key="description"
+              gi="description"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">description</xsl:attribute>
          </xsl:if>
@@ -5116,33 +5259,33 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:string[@key='description']"
-                 mode="get-value-property"
-                 priority="6">
+                  mode="get-value-property"
+                  priority="6">
       <value as-type="markup-multiline" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/document-id" -->
       <field collapsible="no"
-             as-type="string"
-             name="document-id"
-             gi="document-id">
+              as-type="string"
+              name="document-id"
+              gi="document-id">
          <xsl:apply-templates select="*[@key='scheme']"/>
          <xsl:apply-templates select="." mode="get-value-property"/>
       </field>
    </xsl:template>
    <!-- matching system-security-plan/back-matter/resource/document-id-->
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='document-ids']/j:map"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="string" key="identifier" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation" -->
       <assembly name="citation" key="citation" gi="citation">
@@ -5155,15 +5298,15 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5171,22 +5314,22 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="7">
+                  mode="get-value-property"
+                  priority="7">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 priority="9">
+                  priority="9">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/citation/link/text" -->
       <field collapsible="no"
-             as-type="markup-line"
-             name="text"
-             key="text"
-             gi="text"
-             in-json="SCALAR">
+              as-type="markup-line"
+              name="text"
+              key="text"
+              gi="text"
+              in-json="SCALAR">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">text</xsl:attribute>
          </xsl:if>
@@ -5194,14 +5337,14 @@
       </field>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='citation']/j:array[@key='links']/j:map/j:string[@key='text']"
-                 mode="get-value-property"
-                 priority="9">
+                  mode="get-value-property"
+                  priority="9">
       <value as-type="markup-line" in-json="string">
          <xsl:value-of select="."/>
       </value>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:array[@key='rlinks']/j:map"
-                 priority="7">
+                  priority="7">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/rlink" -->
       <assembly name="rlink" gi="rlink">
@@ -5211,14 +5354,14 @@
       </assembly>
    </xsl:template>
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 priority="6">
+                  priority="6">
       <xsl:param name="with-key" select="true()"/>
       <!-- XML match="system-security-plan/back-matter/resource/base64" -->
       <field collapsible="no"
-             as-type="base64Binary"
-             name="base64"
-             key="base64"
-             gi="base64">
+              as-type="base64Binary"
+              name="base64"
+              key="base64"
+              gi="base64">
          <xsl:if test="$with-key">
             <xsl:attribute name="key">base64</xsl:attribute>
          </xsl:if>
@@ -5229,7 +5372,7 @@
    </xsl:template>
    <!-- matching system-security-plan/back-matter/resource/base64-->
    <xsl:template match="j:map[@key='system-security-plan']/j:map[@key='back-matter']/j:array[@key='resources']/j:map/j:map[@key='base64']"
-                 mode="get-value-property">
+                  mode="get-value-property">
       <value as-type="base64Binary" key="value" in-json="string">
          <xsl:apply-templates mode="keep-value-property"/>
       </value>
@@ -5243,8 +5386,8 @@
    </xsl:template>
    <!-- JSON to XML conversion: Markdown to markup inferencing -->
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-line')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-line')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <!-- if this is valid only a single p comes back but who can tell? -->
@@ -5254,8 +5397,8 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="cast-md"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="value[@as-type=('markup-multiline')]">
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
+                  match="value[@as-type=('markup-multiline')]">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:call-template name="parse-markdown">
@@ -5284,15 +5427,15 @@
       <!-- Blocks is split between code blocks and everything else -->
       <xsl:variable name="blocks">
          <xsl:for-each-group select="tokenize($str, '\n')"
-                             group-starting-with=".[matches(., '^```')]">
+                              group-starting-with=".[matches(., '^```')]">
                 <!-- odd groups are code if the first one has code, otherwise evens -->
             <xsl:variable name="this-is-code"
-                          select="not((position() mod 2) + number($starts-with-code))"/>
+                           select="not((position() mod 2) + number($starts-with-code))"/>
             <p><!-- Adding an attribute flag when this is a code block, code='code' -->
                <xsl:if test="$this-is-code">
                   <xsl:variable name="language"
-                                expand-text="true"
-                                select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
+                                 expand-text="true"
+                                 select="(replace(.,'^```','') ! normalize-space(.))[matches(.,'\S')]"/>
                   <xsl:attribute name="code" select="if ($language) then $language else 'code'"/>
                </xsl:if>
                <xsl:value-of select="string-join(current-group()[not(matches(., '^```'))],'&#xA;')"/>
@@ -5323,9 +5466,9 @@
       </xsl:copy>
    </xsl:template>
    <xsl:template mode="parse-block"
-                 priority="1"
-                 match="p[exists(@code)]"
-                 expand-text="true">
+                  priority="1"
+                  match="p[exists(@code)]"
+                  expand-text="true">
       <pre>
          <xsl:for-each select="@code[not(.='code')]">
             <xsl:attribute name="class">language-{.}</xsl:attribute>
@@ -5363,8 +5506,8 @@
       </table>
    </xsl:template>
    <xsl:template match="tr[m:is-table-row-demarcator(string(.))]"
-                 priority="5"
-                 mode="make-row"/>
+                  priority="5"
+                  mode="make-row"/>
    <xsl:template match="tr" mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
@@ -5375,7 +5518,7 @@
       </tr>
    </xsl:template>
    <xsl:template match="tr[some $f in (following-sibling::tr) satisfies m:is-table-row-demarcator(string($f))]"
-                 mode="make-row">
+                  mode="make-row">
       <tr>
          <xsl:for-each select="tokenize(string(.), '\s*\|\s*')[not(position() = (1,last())) ]">
             <th>
@@ -5394,9 +5537,9 @@
    <xsl:template mode="mark-structures" match="p[matches(.,$li-regex)]">
       <list>
          <xsl:for-each-group group-starting-with=".[matches(.,$li-regex)]"
-                             select="tokenize(., '\n')">
+                              select="tokenize(., '\n')">
             <li level="{ replace(.,'\S.*$','') ! floor(string-length(.) div 2)}"
-                type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
+                 type="{ if (matches(.,'\s*\d')) then 'ol' else 'ul' }">
                <xsl:for-each select="current-group()[normalize-space(.)]">
                   <xsl:if test="not(position() eq 1)">
                      <br/>
@@ -5410,7 +5553,7 @@
    <xsl:template mode="build-structures" match="p[@header-level]">
       <xsl:variable name="level" select="(@header-level[6 &gt;= .],6)[1]"/>
       <xsl:element name="h{$level}"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:value-of select="."/>
       </xsl:element>
    </xsl:template>
@@ -5424,9 +5567,9 @@
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level and not(@type = preceding-sibling::*[1]/@type)]">-->
       <!--<xsl:for-each-group select="$group" group-starting-with="*[@level = $level]">-->
       <xsl:element name="{ $group[1]/@type }"
-                   namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                    namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
          <xsl:for-each-group select="$group"
-                             group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
+                              group-starting-with="li[(@level = $level) or not(@type = preceding-sibling::*[1]/@type)]">
             <xsl:choose>
                <xsl:when test="@level = $level (: checking first item in group :)">
                   <li>
@@ -5605,40 +5748,40 @@
    <xsl:variable name="line-example" xml:space="preserve"> { insertion } </xsl:variable>
    <!-- JSON to XML conversion: Supermodel serialization as XML -->
    <xsl:strip-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                    elements="s:*"/>
+                     elements="s:*"/>
    <xsl:preserve-space xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                       elements="s:flag s:value"/>
+                        elements="s:flag s:value"/>
    <xsl:mode xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-             name="write-xml"/>
+              name="write-xml"/>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:*[exists(@gi)]"
-                 mode="write-xml">
+                  match="s:*[exists(@gi)]"
+                  mode="write-xml">
       <xsl:element name="{@gi}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
             <!-- putting flags first in case of disarranged inputs -->
          <xsl:apply-templates select="s:flag, (* except s:flag)" mode="write-xml"/>
       </xsl:element>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="s:value[@as-type=('markup-line','markup-multiline')]"
-                 mode="write-xml">
+                  match="s:value[@as-type=('markup-line','markup-multiline')]"
+                  mode="write-xml">
       <xsl:apply-templates mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
-                 xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
+                  match="p | ul | ol | pre | h1 | h2 | h3 | h4 | h5 | h6 | table"
+                  xpath-default-namespace="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel">
       <xsl:apply-templates select="." mode="cast-prose"/>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 priority="2"
-                 match="s:flag"
-                 mode="write-xml">
+                  priority="2"
+                  match="s:flag"
+                  mode="write-xml">
       <xsl:attribute name="{@gi}">
          <xsl:value-of select="."/>
       </xsl:attribute>
    </xsl:template>
    <xsl:template xmlns:s="http://csrc.nist.gov/ns/oscal/metaschema/1.0/supermodel"
-                 match="*"
-                 mode="cast-prose">
+                  match="*"
+                  mode="cast-prose">
       <xsl:element name="{local-name()}" namespace="http://csrc.nist.gov/ns/oscal/1.0">
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates mode="#current"/>
diff --git a/xml/schema/oscal_assessment-plan_schema.xsd b/xml/schema/oscal_assessment-plan_schema.xsd
index e0e258e55b..ec9a960f1f 100644
--- a/xml/schema/oscal_assessment-plan_schema.xsd
+++ b/xml/schema/oscal_assessment-plan_schema.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Assessment Plan Model</m:schema-name>
@@ -30,13 +30,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-ssp"
-                     type="oscal-assessment-common-import-ssp-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-import-ssp-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="local-definitions" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -49,33 +49,33 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="component"
-                              type="oscal-implementation-common-system-component-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-component-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="inventory-item"
-                              type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="user"
-                              type="oscal-implementation-common-system-user-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-user-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="objectives-and-methods"
-                              type="oscal-assessment-common-local-objective-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-local-objective-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="activity"
-                              type="oscal-assessment-common-activity-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-activity-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -96,38 +96,38 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="part"
-                              type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
          <xs:element name="reviewed-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="assessment-subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="assessment-assets"
-                     type="oscal-assessment-common-assessment-assets-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-assessment-assets-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Plan Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment plan in <a href="/concepts/identifier-use/#ap-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment plan</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment plan in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ap-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment plan</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Plan Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -137,11 +137,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -160,473 +160,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -634,10 +638,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -645,10 +649,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -656,10 +660,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -671,10 +675,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -682,22 +686,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -716,13 +720,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -731,35 +735,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -769,14 +773,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -790,10 +794,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -804,10 +808,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -818,10 +822,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -832,20 +836,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -856,20 +860,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -896,10 +900,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -907,10 +921,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -942,21 +956,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -964,32 +988,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1000,10 +1024,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1011,32 +1112,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1047,10 +1148,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1069,10 +1170,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1082,10 +1183,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -1095,10 +1196,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1106,10 +1207,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1117,21 +1218,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -1139,10 +1240,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -1150,10 +1251,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1181,9 +1282,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -1202,10 +1303,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1215,10 +1316,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1263,10 +1364,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1274,10 +1375,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1297,10 +1398,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1344,25 +1445,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1373,10 +1474,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1406,25 +1507,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1435,7 +1536,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Method Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Method Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1483,13 +1584,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="step" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -1532,29 +1633,29 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="reviewed-controls"
-                              type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="1"/>
+                               type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1565,7 +1666,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Step Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Step Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1574,21 +1675,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="related-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1599,7 +1700,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Activity Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Activity Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1647,13 +1748,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="timing" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -1771,10 +1872,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1785,7 +1886,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -1794,9 +1895,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="associated-activity" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -1809,29 +1910,29 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1842,7 +1943,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Activity Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Activity Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an activity defined in the list of activities.</xs:documentation>
@@ -1851,21 +1952,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1876,7 +1977,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1919,13 +2020,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-selection" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -1953,35 +2054,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-control"
-                                 type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-control"
-                              type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1991,8 +2092,8 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="control-objective-selection"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
+                      minOccurs="0"
+                      maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
@@ -2019,35 +2120,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-objective"
-                                 type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-objective"
-                              type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2060,10 +2161,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2099,10 +2200,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2165,7 +2266,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2174,21 +2275,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2199,7 +2300,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Subject Placeholder Universally Unique Identifier</b>: A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2232,35 +2333,35 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-subject"
-                        type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-subject"
-                     type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2289,21 +2390,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2314,7 +2415,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -2335,7 +2436,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Identifies the Subject</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>Identifies the Subject</b>: A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</xs:documentation>
@@ -2357,21 +2458,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2382,7 +2483,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -2410,9 +2511,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="assessment-platform" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2440,13 +2541,13 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="uses-component" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
@@ -2459,25 +2560,25 @@
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-party"
-                                       type="oscal-metadata-responsible-party-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-party-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2488,7 +2589,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -2500,10 +2601,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2514,7 +2615,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Platform Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Platform Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2565,13 +2666,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -2587,10 +2688,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2620,17 +2721,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
-                     type="oscal-implementation-common-implementation-status-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-implementation-status-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2651,13 +2752,151 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Finding Target Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Finding Target Identifier Reference</b>: A machine-oriented identifier reference for a specific target qualified by the type.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
+   <xs:complexType name="oscal-assessment-common-finding-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Finding</m:formal-name>
+            <m:description>Describes an individual finding.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Finding</b>: Describes an individual finding.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="title" minOccurs="1" maxOccurs="1">
+            <xs:complexType mixed="true">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Title</m:formal-name>
+                     <m:description>The title for this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Title</b>: The title for this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupLineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="description" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Description</m:formal-name>
+                     <m:description>A human-readable description of this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Description</b>: A human-readable description of this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupMultilineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="origin"
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-assessment-common-finding-target-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="implementation-statement-uuid" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Implementation Statement UUID</m:formal-name>
+                     <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the implementation statement in the SSP to which this finding is related.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Implementation Statement UUID</b>: A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="UUIDDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Related Observation</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced observations that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Related Observation</b>: Relates the finding to a set of referenced observations that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="observation-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="associated-risk" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Associated Risk</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced risks that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Associated Risk</b>: Relates the finding to a set of referenced risks that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="risk-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Finding Universally Unique Identifier</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this finding in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>finding</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Finding Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
    <xs:complexType name="oscal-assessment-common-observation-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -2699,13 +2938,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="method" minOccurs="1" maxOccurs="unbounded">
             <xs:simpleType>
                <xs:annotation>
@@ -2733,13 +2972,13 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="relevant-evidence" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2767,21 +3006,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2830,10 +3069,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2844,7 +3083,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Observation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Observation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2862,13 +3101,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="actor"
-                     type="oscal-assessment-common-origin-actor-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-actor-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="related-task"
-                     type="oscal-assessment-common-related-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-related-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-assessment-common-origin-actor-ASSEMBLY">
@@ -2882,13 +3121,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="type" use="required" type="TokenDatatype">
          <xs:annotation>
@@ -2904,7 +3143,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Actor Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Actor Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to the tool or person based on the associated type.</xs:documentation>
@@ -2932,21 +3171,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="identified-subject" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -2959,15 +3198,15 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="subject-placeholder-uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Subject Placeholder Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.</xs:documentation>
@@ -2979,10 +3218,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2993,7 +3232,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -3090,29 +3329,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status"
-                     type="oscal-assessment-common-risk-status-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-risk-status-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="threat-id"
-                     type="oscal-assessment-common-threat-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-threat-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="characterization"
-                     type="oscal-assessment-common-characterization-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-characterization-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="mitigating-factor" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3140,23 +3379,23 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Mitigating Factor Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Mitigating Factor Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3166,7 +3405,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Implementation UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Implementation UUID</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3188,9 +3427,9 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="response"
-                     type="oscal-assessment-common-response-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-response-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk-log" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -3270,21 +3509,21 @@
                               </xs:simpleType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="logged-by"
-                                       type="oscal-assessment-common-logged-by-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-logged-by-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="status-change"
-                                       type="oscal-assessment-common-risk-status-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
+                                        type="oscal-assessment-common-risk-status-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
                            <xs:element name="related-response" minOccurs="0" maxOccurs="unbounded">
                               <xs:complexType>
                                  <xs:annotation>
@@ -3297,25 +3536,25 @@
                                  </xs:annotation>
                                  <xs:sequence>
                                     <xs:element name="prop"
-                                                type="oscal-metadata-property-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-property-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="link"
-                                                type="oscal-metadata-link-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-link-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="related-task"
-                                                type="oscal-assessment-common-related-task-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-assessment-common-related-task-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                                        <xs:annotation>
                                           <xs:appinfo>
                                              <m:formal-name>Remarks</m:formal-name>
-                                             <m:description>Additional commentary on the containing object.</m:description>
+                                             <m:description>Additional commentary about the containing object.</m:description>
                                           </xs:appinfo>
                                           <xs:documentation>
-                                             <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                             <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                                        </xs:annotation>
                                        <xs:complexType>
                                           <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3326,7 +3565,7 @@
                                     <xs:annotation>
                                        <xs:appinfo>
                                           <m:formal-name>Response Universally Unique Identifier Reference</m:formal-name>
-                                          <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
+                                          <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
                                        </xs:appinfo>
                                        <xs:documentation>
                                           <b>Response Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique risk response.</xs:documentation>
@@ -3338,10 +3577,10 @@
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3352,7 +3591,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Risk Log Entry Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Risk Log Entry Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3377,7 +3616,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
@@ -3390,7 +3629,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Risk Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Risk Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3410,7 +3649,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Party UUID Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Party UUID Reference</b>: A machine-oriented identifier reference to the party who is making the log entry.</xs:documentation>
@@ -3449,17 +3688,17 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="facet" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3472,21 +3711,21 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3568,17 +3807,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="required-asset" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3591,9 +3830,9 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
                      <xs:complexType mixed="true">
                         <xs:annotation>
@@ -3625,21 +3864,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3650,7 +3889,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Required Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Required Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3659,17 +3898,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3680,7 +3919,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Remediation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Remediation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3723,24 +3962,24 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Part Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3777,14 +4016,14 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -3792,10 +4031,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -3803,61 +4042,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -3868,13 +4107,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -3895,10 +4134,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -3906,31 +4145,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3941,41 +4180,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -4009,10 +4249,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -4021,10 +4261,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4035,7 +4275,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -4048,7 +4288,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -4059,14 +4299,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -4096,7 +4336,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -4162,13 +4402,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -4184,10 +4424,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4207,21 +4447,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4232,7 +4472,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4275,15 +4515,15 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="port-range"
-                     type="oscal-implementation-common-port-range-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-port-range-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Service Protocol Information Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Service Protocol Information Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4354,10 +4594,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4429,29 +4669,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="role-id"
-                     type="oscal-metadata-role-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-role-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="authorized-privilege"
-                     type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4462,7 +4702,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>User Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>User Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4510,9 +4750,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="function-performed"
-                     type="oscal-implementation-common-function-performed-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-function-performed-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="oscal-implementation-common-function-performed-FIELD">
@@ -4552,17 +4792,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-component" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -4575,25 +4815,25 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4604,7 +4844,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -4616,10 +4856,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4630,7 +4870,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Inventory Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Inventory Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4664,10 +4904,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4678,7 +4918,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Parameter ID</b>: A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.</xs:documentation>
@@ -4689,7 +4929,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Identification</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>System Identification</b>: A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.</xs:documentation>
@@ -4756,9 +4996,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_assessment-results_schema.xsd b/xml/schema/oscal_assessment-results_schema.xsd
index 080e2d5c07..ecc4ee4a28 100644
--- a/xml/schema/oscal_assessment-results_schema.xsd
+++ b/xml/schema/oscal_assessment-results_schema.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Assessment Results Model</m:schema-name>
@@ -30,13 +30,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-ap"
-                     type="oscal-ar-import-ap-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ar-import-ap-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="local-definitions" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -49,21 +49,21 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="objectives-and-methods"
-                              type="oscal-assessment-common-local-objective-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-local-objective-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="activity"
-                              type="oscal-assessment-common-activity-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-activity-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -73,19 +73,19 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="result"
-                     type="oscal-ar-result-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ar-result-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Results Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment results instance in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment results instance in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Results Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -159,13 +159,13 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="local-definitions" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -178,32 +178,32 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="component"
-                              type="oscal-implementation-common-system-component-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-component-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="inventory-item"
-                              type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="user"
-                              type="oscal-implementation-common-system-user-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-user-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="assessment-assets"
-                              type="oscal-assessment-common-assessment-assets-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="1"/>
+                               type="oscal-assessment-common-assessment-assets-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                   <xs:element name="assessment-task"
-                              type="oscal-assessment-common-task-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-task-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
          <xs:element name="reviewed-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="attestation" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -216,13 +216,13 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="part"
-                              type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
@@ -305,29 +305,29 @@
                               </xs:simpleType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="logged-by"
-                                       type="oscal-assessment-common-logged-by-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-logged-by-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="related-task"
-                                       type="oscal-assessment-common-related-task-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-related-task-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -338,7 +338,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Assessment Log Entry Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference an assessment event in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference an assessment event in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Assessment Log Entry Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -350,25 +350,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="observation"
-                     type="oscal-assessment-common-observation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-observation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk"
-                     type="oscal-assessment-common-risk-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-risk-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="finding"
-                     type="oscal-ar-finding-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-finding-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -379,151 +379,13 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Results Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this set of results in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this set of results in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Results Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-ar-finding-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Finding</m:formal-name>
-            <m:description>Describes an individual finding.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Finding</b>: Describes an individual finding.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Finding Title</m:formal-name>
-                     <m:description>The title for this finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Finding Title</b>: The title for this finding.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="description" minOccurs="1" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Finding Description</m:formal-name>
-                     <m:description>A human-readable description of this finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Finding Description</b>: A human-readable description of this finding.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="target"
-                     type="oscal-assessment-common-finding-target-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="implementation-statement-uuid" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Implementation Statement UUID</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the implementation statement in the SSP to which this finding is related.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Implementation Statement UUID</b>: A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Related Observation</m:formal-name>
-                     <m:description>Relates the finding to a set of referenced observations that were used to determine the finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Related Observation</b>: Relates the finding to a set of referenced observations that were used to determine the finding.</xs:documentation>
-               </xs:annotation>
-               <xs:attribute name="observation-uuid" use="required" type="UUIDDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="associated-risk" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Associated Risk</m:formal-name>
-                     <m:description>Relates the finding to a set of referenced risks that were used to determine the finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Associated Risk</b>: Relates the finding to a set of referenced risks that were used to determine the finding.</xs:documentation>
-               </xs:annotation>
-               <xs:attribute name="risk-uuid" use="required" type="UUIDDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Finding Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this finding in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>finding</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Finding Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
    <xs:complexType name="oscal-ar-import-ap-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -538,10 +400,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -562,11 +424,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -585,473 +447,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -1059,10 +925,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -1070,10 +936,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -1081,10 +947,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -1096,10 +962,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -1107,22 +973,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -1141,13 +1007,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -1156,35 +1022,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -1194,14 +1060,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -1215,10 +1081,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -1229,10 +1095,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1243,10 +1109,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -1257,20 +1123,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1281,20 +1147,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -1321,10 +1187,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1332,10 +1208,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -1367,21 +1243,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1389,32 +1275,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1425,10 +1311,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1436,32 +1399,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1472,10 +1435,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1494,10 +1457,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1507,10 +1470,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -1520,10 +1483,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1531,10 +1494,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1542,21 +1505,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -1564,10 +1527,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -1575,10 +1538,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1606,9 +1569,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -1627,10 +1590,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1640,10 +1603,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1688,10 +1651,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1699,10 +1662,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1722,10 +1685,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1769,25 +1732,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1798,10 +1761,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1831,25 +1794,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1860,7 +1823,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Method Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Method Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1908,13 +1871,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="step" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -1957,29 +1920,29 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="reviewed-controls"
-                              type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="1"/>
+                               type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1990,7 +1953,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Step Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Step Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1999,21 +1962,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="related-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2024,7 +1987,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Activity Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Activity Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2072,13 +2035,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="timing" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -2196,10 +2159,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2210,7 +2173,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -2219,9 +2182,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="associated-activity" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2234,29 +2197,29 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2267,7 +2230,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Activity Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Activity Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an activity defined in the list of activities.</xs:documentation>
@@ -2276,21 +2239,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2301,7 +2264,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2344,13 +2307,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-selection" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2378,35 +2341,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-control"
-                                 type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-control"
-                              type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2416,8 +2379,8 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="control-objective-selection"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
+                      minOccurs="0"
+                      maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
@@ -2444,35 +2407,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-objective"
-                                 type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-objective"
-                              type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2485,10 +2448,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2524,10 +2487,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2590,7 +2553,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2599,21 +2562,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2624,7 +2587,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Subject Placeholder Universally Unique Identifier</b>: A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2657,35 +2620,35 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-subject"
-                        type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-subject"
-                     type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2714,21 +2677,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2739,7 +2702,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -2760,7 +2723,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Identifies the Subject</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>Identifies the Subject</b>: A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</xs:documentation>
@@ -2782,21 +2745,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2807,7 +2770,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -2835,9 +2798,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="assessment-platform" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2865,13 +2828,13 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="uses-component" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
@@ -2884,25 +2847,25 @@
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-party"
-                                       type="oscal-metadata-responsible-party-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-party-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2913,7 +2876,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -2925,10 +2888,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2939,7 +2902,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Platform Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Platform Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2990,13 +2953,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -3012,10 +2975,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3045,17 +3008,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
-                     type="oscal-implementation-common-implementation-status-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-implementation-status-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3076,13 +3039,151 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Finding Target Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Finding Target Identifier Reference</b>: A machine-oriented identifier reference for a specific target qualified by the type.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
+   <xs:complexType name="oscal-assessment-common-finding-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Finding</m:formal-name>
+            <m:description>Describes an individual finding.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Finding</b>: Describes an individual finding.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="title" minOccurs="1" maxOccurs="1">
+            <xs:complexType mixed="true">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Title</m:formal-name>
+                     <m:description>The title for this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Title</b>: The title for this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupLineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="description" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Description</m:formal-name>
+                     <m:description>A human-readable description of this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Description</b>: A human-readable description of this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupMultilineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="origin"
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-assessment-common-finding-target-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="implementation-statement-uuid" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Implementation Statement UUID</m:formal-name>
+                     <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the implementation statement in the SSP to which this finding is related.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Implementation Statement UUID</b>: A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="UUIDDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Related Observation</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced observations that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Related Observation</b>: Relates the finding to a set of referenced observations that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="observation-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="associated-risk" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Associated Risk</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced risks that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Associated Risk</b>: Relates the finding to a set of referenced risks that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="risk-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Finding Universally Unique Identifier</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this finding in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>finding</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Finding Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
    <xs:complexType name="oscal-assessment-common-observation-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -3124,13 +3225,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="method" minOccurs="1" maxOccurs="unbounded">
             <xs:simpleType>
                <xs:annotation>
@@ -3158,13 +3259,13 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="relevant-evidence" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3192,21 +3293,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3255,10 +3356,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3269,7 +3370,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Observation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Observation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3287,13 +3388,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="actor"
-                     type="oscal-assessment-common-origin-actor-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-actor-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="related-task"
-                     type="oscal-assessment-common-related-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-related-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-assessment-common-origin-actor-ASSEMBLY">
@@ -3307,13 +3408,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="type" use="required" type="TokenDatatype">
          <xs:annotation>
@@ -3329,7 +3430,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Actor Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Actor Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to the tool or person based on the associated type.</xs:documentation>
@@ -3357,21 +3458,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="identified-subject" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -3384,15 +3485,15 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="subject-placeholder-uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Subject Placeholder Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.</xs:documentation>
@@ -3404,10 +3505,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3418,7 +3519,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -3515,29 +3616,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status"
-                     type="oscal-assessment-common-risk-status-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-risk-status-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="threat-id"
-                     type="oscal-assessment-common-threat-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-threat-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="characterization"
-                     type="oscal-assessment-common-characterization-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-characterization-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="mitigating-factor" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3565,23 +3666,23 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Mitigating Factor Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Mitigating Factor Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3591,7 +3692,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Implementation UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Implementation UUID</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3613,9 +3714,9 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="response"
-                     type="oscal-assessment-common-response-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-response-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk-log" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -3695,21 +3796,21 @@
                               </xs:simpleType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="logged-by"
-                                       type="oscal-assessment-common-logged-by-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-logged-by-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="status-change"
-                                       type="oscal-assessment-common-risk-status-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
+                                        type="oscal-assessment-common-risk-status-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
                            <xs:element name="related-response" minOccurs="0" maxOccurs="unbounded">
                               <xs:complexType>
                                  <xs:annotation>
@@ -3722,25 +3823,25 @@
                                  </xs:annotation>
                                  <xs:sequence>
                                     <xs:element name="prop"
-                                                type="oscal-metadata-property-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-property-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="link"
-                                                type="oscal-metadata-link-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-link-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="related-task"
-                                                type="oscal-assessment-common-related-task-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-assessment-common-related-task-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                                        <xs:annotation>
                                           <xs:appinfo>
                                              <m:formal-name>Remarks</m:formal-name>
-                                             <m:description>Additional commentary on the containing object.</m:description>
+                                             <m:description>Additional commentary about the containing object.</m:description>
                                           </xs:appinfo>
                                           <xs:documentation>
-                                             <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                             <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                                        </xs:annotation>
                                        <xs:complexType>
                                           <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3751,7 +3852,7 @@
                                     <xs:annotation>
                                        <xs:appinfo>
                                           <m:formal-name>Response Universally Unique Identifier Reference</m:formal-name>
-                                          <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
+                                          <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
                                        </xs:appinfo>
                                        <xs:documentation>
                                           <b>Response Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique risk response.</xs:documentation>
@@ -3763,10 +3864,10 @@
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3777,7 +3878,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Risk Log Entry Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Risk Log Entry Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3802,7 +3903,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
@@ -3815,7 +3916,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Risk Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Risk Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3835,7 +3936,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Party UUID Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Party UUID Reference</b>: A machine-oriented identifier reference to the party who is making the log entry.</xs:documentation>
@@ -3874,17 +3975,17 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="facet" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3897,21 +3998,21 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3993,17 +4094,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="required-asset" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -4016,9 +4117,9 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
                      <xs:complexType mixed="true">
                         <xs:annotation>
@@ -4050,21 +4151,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4075,7 +4176,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Required Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Required Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4084,17 +4185,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4105,7 +4206,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Remediation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Remediation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4148,24 +4249,24 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Part Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4202,14 +4303,14 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -4217,10 +4318,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -4228,61 +4329,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -4293,13 +4394,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -4320,10 +4421,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -4331,31 +4432,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4366,41 +4467,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -4434,10 +4536,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -4446,10 +4548,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4460,7 +4562,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -4473,7 +4575,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -4484,14 +4586,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -4521,7 +4623,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -4587,13 +4689,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -4609,10 +4711,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4632,21 +4734,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4657,7 +4759,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4700,15 +4802,15 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="port-range"
-                     type="oscal-implementation-common-port-range-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-port-range-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Service Protocol Information Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Service Protocol Information Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4779,10 +4881,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4854,29 +4956,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="role-id"
-                     type="oscal-metadata-role-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-role-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="authorized-privilege"
-                     type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4887,7 +4989,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>User Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>User Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4935,9 +5037,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="function-performed"
-                     type="oscal-implementation-common-function-performed-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-function-performed-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="oscal-implementation-common-function-performed-FIELD">
@@ -4977,17 +5079,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-component" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -5000,25 +5102,25 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5029,7 +5131,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -5041,10 +5143,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5055,7 +5157,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Inventory Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Inventory Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5089,10 +5191,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5103,7 +5205,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Parameter ID</b>: A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.</xs:documentation>
@@ -5114,7 +5216,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Identification</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>System Identification</b>: A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.</xs:documentation>
@@ -5181,9 +5283,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_catalog_schema.xsd b/xml/schema/oscal_catalog_schema.xsd
index 2ce94922e6..c0928d5645 100644
--- a/xml/schema/oscal_catalog_schema.xsd
+++ b/xml/schema/oscal_catalog_schema.xsd
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Control Catalog Model</m:schema-name>
          <m:schema-version>1.0.6</m:schema-version>
          <m:short-name>oscal-catalog</m:short-name>
          <m:remarks>
-            <p>The OSCAL Control Catalog format can be used to describe a collection of security controls and related control enhancements, along with contextualizing documentation and metadata. The root of the Control Catalog format is <code>catalog</code>. </p>
+            <p>The OSCAL Control Catalog format can be used to describe a collection of security controls and related control enhancements, along with contextualizing documentation and metadata. The root of the Control Catalog format is <code>catalog</code>.</p>
          </m:remarks>
          <m:root>catalog</m:root>
       </xs:appinfo>
@@ -22,41 +22,41 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Catalog</m:formal-name>
-            <m:description>A collection of controls.</m:description>
+            <m:description>A structured, <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#catalog">organized collection</a> of control information.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Catalog</b>: A collection of controls.</xs:documentation>
+            <b>Catalog</b>: A structured, organized collection of control information.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control"
-                     type="oscal-catalog-control-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-catalog-control-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="group"
-                     type="oscal-catalog-group-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-catalog-group-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Catalog Universally Unique Identifier</m:formal-name>
-               <m:description>A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</m:description>
+               <m:description>Provides a globally unique means to identify a given catalog instance.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Catalog Universally Unique Identifier</b>: A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</xs:documentation>
+               <b>Catalog Universally Unique Identifier</b>: Provides a globally unique means to identify a given catalog instance.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -86,40 +86,40 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="group"
-                        type="oscal-catalog-group-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-catalog-group-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="control"
-                        type="oscal-catalog-control-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-catalog-control-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
          </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Group Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined group elsewhere in <a href="/concepts/identifier-use/#catalog-identifiers">in this and other OSCAL instances (e.g., profiles)</a>. This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same group across revisions of the document.</m:description>
+               <m:description>Identifies the group for the purpose of cross-linking within the defining instance or from other instances that reference the catalog.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Group Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.</xs:documentation>
+               <b>Group Identifier</b>: Identifies the group for the purpose of cross-linking within the defining instance or from other instances that reference the catalog.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
@@ -137,10 +137,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Control</m:formal-name>
-            <m:description>A structured information object representing a security or privacy control. Each security or privacy control within the Catalog is defined by a distinct control instance.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#control">structured object</a> representing a requirement or guideline, which when implemented will reduce an aspect of risk related to an information system and its information.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Control</b>: A structured information object representing a security or privacy control. Each security or privacy control within the Catalog is defined by a distinct control instance.</xs:documentation>
+            <b>Control</b>: A structured object representing a requirement or guideline, which when implemented will reduce an aspect of risk related to an information system and its information.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -159,34 +159,66 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="mapping" minOccurs="0" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Mapping</m:formal-name>
+                     <m:description>A mapping between the containing control and another resource.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Mapping</b>: A mapping between the containing control and another resource.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="target-resource"
+                               type="oscal-mapping-common-mapping-resource-reference-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="1"/>
+                  <xs:element name="map"
+                               type="oscal-mapping-common-map-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Mapping Identifier</m:formal-name>
+                        <m:description>The unique identifier for the mapping.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Mapping Identifier</b>: The unique identifier for the mapping.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
          <xs:element name="control"
-                     type="oscal-catalog-control-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-catalog-control-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#instance">instance</a> scope that can be used to reference this control elsewhere <a href="/concepts/identifier-use/#catalog-identifiers">in this and other OSCAL instances (e.g., profiles)</a>. This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same control across revisions of the document.</m:description>
+               <m:description>Identifies a control such that it can be referenced in the defining catalog and other OSCAL instances (e.g., profiles).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier</b>: A human-oriented, locally unique identifier with instance scope that can be used to reference this control elsewhere in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same control across revisions of the document.</xs:documentation>
+               <b>Control Identifier</b>: Identifies a control such that it can be referenced in the defining catalog and other OSCAL instances (e.g., profiles).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
@@ -200,14 +232,14 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -215,10 +247,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -226,61 +258,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -291,13 +323,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -318,10 +350,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -329,31 +361,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -364,41 +396,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -432,10 +465,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -444,10 +477,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -458,7 +491,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -471,7 +504,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -482,14 +515,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -519,7 +552,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -532,11 +565,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -555,473 +588,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -1029,10 +1066,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -1040,10 +1077,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -1051,10 +1088,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -1066,10 +1103,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -1077,22 +1114,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -1111,13 +1148,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -1126,35 +1163,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -1164,14 +1201,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -1185,10 +1222,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -1199,10 +1236,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1213,10 +1250,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -1227,20 +1264,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1251,20 +1288,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -1291,10 +1328,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1302,10 +1349,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -1337,21 +1384,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1359,32 +1416,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1395,10 +1452,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1406,32 +1540,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1442,10 +1576,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1464,10 +1598,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1477,10 +1611,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -1490,10 +1624,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1501,10 +1635,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1512,21 +1646,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -1534,10 +1668,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -1545,10 +1679,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1576,9 +1710,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -1597,10 +1731,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1610,10 +1744,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1658,10 +1792,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1669,15 +1803,198 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
       </xs:simpleContent>
    </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-map-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Entry</m:formal-name>
+            <m:description>A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Entry</b>: A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="relationship" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Mapping Entry Relationship</m:formal-name>
+                     <m:description>The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Mapping Entry Relationship</b>: The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.</xs:documentation>
+               </xs:annotation>
+               <xs:simpleContent>
+                  <xs:extension base="TokenDatatype">
+                     <xs:attribute name="ns" type="URIDatatype">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Relationship Value Namespace</m:formal-name>
+                              <m:description>A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Relationship Value Namespace</b>: A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.</xs:documentation>
+                        </xs:annotation>
+                     </xs:attribute>
+                  </xs:extension>
+               </xs:simpleContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="source"
+                      type="oscal-mapping-common-mapping-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-mapping-common-mapping-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Entry Identifier</m:formal-name>
+               <m:description>The unique identifier for the mapping entry.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Entry Identifier</b>: The unique identifier for the mapping entry.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-mapping-item-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Entry Item (source or target)</m:formal-name>
+            <m:description>Identifies a specific edge within a source or target that is the subject of a mapping.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Entry Item (source or target)</b>: Identifies a specific edge within a source or target that is the subject of a mapping.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Subject Type</m:formal-name>
+               <m:description>The semantic type of the subject.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Subject Type</b>: The semantic type of the subject.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="id-ref" use="required" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Subject Identifier Reference</m:formal-name>
+               <m:description>A reference to an identified subject that is of the specified <code>type</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Subject Identifier Reference</b>: A reference to an identified subject that is of the specified type.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-mapping-resource-reference-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapped Resource Reference</m:formal-name>
+            <m:description>A reference to a resource that is either the source or target of a mapping.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapped Resource Reference</b>: A reference to a resource that is either the source or target of a mapping.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Type</m:formal-name>
+               <m:description>The semantic type of the resource.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Resource Type</b>: The semantic type of the resource.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="href" use="required" type="URIReferenceDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Catalog or Profile Reference</m:formal-name>
+               <m:description>A resolvable URL reference to the base catalog or profile that this profile is tailoring.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Catalog or Profile Reference</b>: A resolvable URL reference to the base catalog or profile that this profile is tailoring.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
    <xs:complexType name="MarkupMultilineDatatype">
       <xs:choice minOccurs="1" maxOccurs="unbounded">
          <xs:group ref="blockElementGroup"/>
@@ -1725,9 +2042,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_complete_schema.xsd b/xml/schema/oscal_complete_schema.xsd
index e45ec05267..248b1a9bdb 100644
--- a/xml/schema/oscal_complete_schema.xsd
+++ b/xml/schema/oscal_complete_schema.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Unified Model of Models</m:schema-name>
@@ -15,6 +15,7 @@
             <p>This format represents a combination of all of the OSCAL models.</p>
          </m:remarks>
          <m:root>catalog</m:root>
+         <m:root>mapping-collection</m:root>
          <m:root>profile</m:root>
          <m:root>component-definition</m:root>
          <m:root>system-security-plan</m:root>
@@ -28,41 +29,41 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Catalog</m:formal-name>
-            <m:description>A collection of controls.</m:description>
+            <m:description>A structured, <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#catalog">organized collection</a> of control information.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Catalog</b>: A collection of controls.</xs:documentation>
+            <b>Catalog</b>: A structured, organized collection of control information.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control"
-                     type="oscal-catalog-control-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-catalog-control-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="group"
-                     type="oscal-catalog-group-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-catalog-group-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Catalog Universally Unique Identifier</m:formal-name>
-               <m:description>A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</m:description>
+               <m:description>Provides a globally unique means to identify a given catalog instance.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Catalog Universally Unique Identifier</b>: A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</xs:documentation>
+               <b>Catalog Universally Unique Identifier</b>: Provides a globally unique means to identify a given catalog instance.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -92,40 +93,40 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="group"
-                        type="oscal-catalog-group-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-catalog-group-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="control"
-                        type="oscal-catalog-control-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-catalog-control-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
          </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Group Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined group elsewhere in <a href="/concepts/identifier-use/#catalog-identifiers">in this and other OSCAL instances (e.g., profiles)</a>. This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same group across revisions of the document.</m:description>
+               <m:description>Identifies the group for the purpose of cross-linking within the defining instance or from other instances that reference the catalog.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Group Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.</xs:documentation>
+               <b>Group Identifier</b>: Identifies the group for the purpose of cross-linking within the defining instance or from other instances that reference the catalog.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
@@ -143,10 +144,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Control</m:formal-name>
-            <m:description>A structured information object representing a security or privacy control. Each security or privacy control within the Catalog is defined by a distinct control instance.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#control">structured object</a> representing a requirement or guideline, which when implemented will reduce an aspect of risk related to an information system and its information.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Control</b>: A structured information object representing a security or privacy control. Each security or privacy control within the Catalog is defined by a distinct control instance.</xs:documentation>
+            <b>Control</b>: A structured object representing a requirement or guideline, which when implemented will reduce an aspect of risk related to an information system and its information.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -165,34 +166,66 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="mapping" minOccurs="0" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Mapping</m:formal-name>
+                     <m:description>A mapping between the containing control and another resource.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Mapping</b>: A mapping between the containing control and another resource.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="target-resource"
+                               type="oscal-mapping-common-mapping-resource-reference-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="1"/>
+                  <xs:element name="map"
+                               type="oscal-mapping-common-map-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Mapping Identifier</m:formal-name>
+                        <m:description>The unique identifier for the mapping.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Mapping Identifier</b>: The unique identifier for the mapping.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
          <xs:element name="control"
-                     type="oscal-catalog-control-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-catalog-control-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#instance">instance</a> scope that can be used to reference this control elsewhere <a href="/concepts/identifier-use/#catalog-identifiers">in this and other OSCAL instances (e.g., profiles)</a>. This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same control across revisions of the document.</m:description>
+               <m:description>Identifies a control such that it can be referenced in the defining catalog and other OSCAL instances (e.g., profiles).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier</b>: A human-oriented, locally unique identifier with instance scope that can be used to reference this control elsewhere in this and other OSCAL instances (e.g., profiles). This id should be assigned per-subject, which means it should be consistently used to identify the same control across revisions of the document.</xs:documentation>
+               <b>Control Identifier</b>: Identifies a control such that it can be referenced in the defining catalog and other OSCAL instances (e.g., profiles).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
@@ -206,14 +239,14 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -221,10 +254,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -232,61 +265,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -297,13 +330,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -324,10 +357,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -335,31 +368,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -370,41 +403,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -438,10 +472,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -450,10 +484,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -464,7 +498,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -477,7 +511,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -488,14 +522,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -525,7 +559,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -538,11 +572,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -561,473 +595,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -1035,10 +1073,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -1046,10 +1084,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -1057,10 +1095,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -1072,10 +1110,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -1083,22 +1121,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -1117,13 +1155,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -1132,35 +1170,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -1170,14 +1208,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -1191,10 +1229,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -1205,10 +1243,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1219,10 +1257,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -1233,20 +1271,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1257,20 +1295,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -1297,10 +1335,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1308,10 +1356,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -1343,68 +1391,155 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-responsible-party-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Responsible Party</m:formal-name>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="party-uuid"
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="role-id" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Responsible Role</m:formal-name>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-metadata-responsible-party-ASSEMBLY">
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
-         <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="role-id" use="required" type="TokenDatatype">
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1412,32 +1547,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1448,10 +1583,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1470,10 +1605,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1483,10 +1618,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -1496,10 +1631,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1507,10 +1642,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1518,21 +1653,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -1540,10 +1675,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -1551,10 +1686,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1582,9 +1717,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -1603,10 +1738,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1616,10 +1751,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1664,10 +1799,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1675,82 +1810,335 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
       </xs:simpleContent>
    </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-map-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Entry</m:formal-name>
+            <m:description>A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Entry</b>: A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="relationship" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Mapping Entry Relationship</m:formal-name>
+                     <m:description>The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Mapping Entry Relationship</b>: The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.</xs:documentation>
+               </xs:annotation>
+               <xs:simpleContent>
+                  <xs:extension base="TokenDatatype">
+                     <xs:attribute name="ns" type="URIDatatype">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Relationship Value Namespace</m:formal-name>
+                              <m:description>A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Relationship Value Namespace</b>: A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.</xs:documentation>
+                        </xs:annotation>
+                     </xs:attribute>
+                  </xs:extension>
+               </xs:simpleContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="source"
+                      type="oscal-mapping-common-mapping-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-mapping-common-mapping-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Entry Identifier</m:formal-name>
+               <m:description>The unique identifier for the mapping entry.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Entry Identifier</b>: The unique identifier for the mapping entry.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-mapping-item-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Entry Item (source or target)</m:formal-name>
+            <m:description>Identifies a specific edge within a source or target that is the subject of a mapping.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Entry Item (source or target)</b>: Identifies a specific edge within a source or target that is the subject of a mapping.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Subject Type</m:formal-name>
+               <m:description>The semantic type of the subject.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Subject Type</b>: The semantic type of the subject.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="id-ref" use="required" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Subject Identifier Reference</m:formal-name>
+               <m:description>A reference to an identified subject that is of the specified <code>type</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Subject Identifier Reference</b>: A reference to an identified subject that is of the specified type.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-mapping-resource-reference-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapped Resource Reference</m:formal-name>
+            <m:description>A reference to a resource that is either the source or target of a mapping.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapped Resource Reference</b>: A reference to a resource that is either the source or target of a mapping.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Type</m:formal-name>
+               <m:description>The semantic type of the resource.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Resource Type</b>: The semantic type of the resource.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="href" use="required" type="URIReferenceDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Catalog or Profile Reference</m:formal-name>
+               <m:description>A resolvable URL reference to the base catalog or profile that this profile is tailoring.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Catalog or Profile Reference</b>: A resolvable URL reference to the base catalog or profile that this profile is tailoring.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:element name="mapping-collection"
+                type="oscal-mapping-mapping-collection-ASSEMBLY"/>
+   <xs:complexType name="oscal-mapping-mapping-collection-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Collection</m:formal-name>
+            <m:description>A collection of relationship-based control and/or control statement mappings.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Collection</b>: A collection of relationship-based control and/or control statement mappings.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="metadata"
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="mapping"
+                      type="oscal-mapping-mapping-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="back-matter"
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Collection Universally Unique Identifier</m:formal-name>
+               <m:description>A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Collection Universally Unique Identifier</b>: A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-mapping-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Control Mapping</m:formal-name>
+            <m:description>A mapping between two target resources.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Control Mapping</b>: A mapping between two target resources.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="source-resource"
+                      type="oscal-mapping-common-mapping-resource-reference-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="target-resource"
+                      type="oscal-mapping-common-mapping-resource-reference-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="map"
+                      type="oscal-mapping-common-map-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Universally Unique Identifier</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>mapping</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same mapping across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined UUID of the mapping can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same mapping across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
    <xs:element name="profile" type="oscal-profile-profile-ASSEMBLY"/>
    <xs:complexType name="oscal-profile-profile-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Profile</m:formal-name>
-            <m:description>Each OSCAL profile is defined by a Profile element</m:description>
+            <m:description>Each OSCAL profile is defined by a <code>profile</code> element.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Profile</b>: Each OSCAL profile is defined by a Profile element</xs:documentation>
+            <b>Profile</b>: Each OSCAL profile is defined by a profile element.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import"
-                     type="oscal-profile-import-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-profile-import-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="merge"
-                     type="oscal-profile-merge-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-profile-merge-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="modify"
-                     type="oscal-profile-modify-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-profile-modify-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Profile Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this profile elsewhere in <a href="/concepts/identifier-use/#profile-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>profile</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This identifier should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same profile across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given profile instance.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Profile Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this profile elsewhere in this or other OSCAL instances. The locally defined UUID of the profile can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This identifier should be assigned per-subject, which means it should be consistently used to identify the same profile across revisions of the document.</xs:documentation>
+               <b>Profile Universally Unique Identifier</b>: Provides a globally unique means to identify a given profile instance.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
    <xs:complexType name="oscal-profile-import-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Import resource</m:formal-name>
-            <m:description>The <code>import</code> designates a catalog or profile to be included (referenced and potentially modified) by this profile. The import also identifies which controls to select using the <code>include-all</code>, <code>include-controls</code>, and <code>exclude-controls</code> directives.</m:description>
+            <m:formal-name>Import Resource</m:formal-name>
+            <m:description>Designates a referenced source catalog or profile that provides a source of control information for use in creating a new overlay or baseline.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Import resource</b>: The import designates a catalog or profile to be included (referenced and potentially modified) by this profile. The import also identifies which controls to select using the include-all, include-controls, and exclude-controls directives.</xs:documentation>
+            <b>Import Resource</b>: Designates a referenced source catalog or profile that provides a source of control information for use in creating a new overlay or baseline.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-controls"
-                        type="oscal-profile-select-control-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-select-control-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-controls"
-                     type="oscal-profile-select-control-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-profile-select-control-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="href" use="required" type="URIReferenceDatatype">
          <xs:annotation>
@@ -1766,31 +2154,31 @@
    <xs:complexType name="oscal-profile-merge-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Merge controls</m:formal-name>
-            <m:description>A Merge element provides structuring directives that drive how controls are organized after resolution.</m:description>
+            <m:formal-name>Merge Controls</m:formal-name>
+            <m:description>Provides structuring directives that instruct how controls are organized after profile resolution.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Merge controls</b>: A Merge element provides structuring directives that drive how controls are organized after resolution.</xs:documentation>
+            <b>Merge Controls</b>: Provides structuring directives that instruct how controls are organized after profile resolution.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="combine" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Combination rule</m:formal-name>
-                     <m:description>A Combine element defines how to combine multiple (competing) versions of the same control.</m:description>
+                     <m:formal-name>Combination Rule</m:formal-name>
+                     <m:description>A Combine element defines how to resolve duplicate instances of the same control (e.g., controls with the same ID).</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Combination rule</b>: A Combine element defines how to combine multiple (competing) versions of the same control.</xs:documentation>
+                     <b>Combination Rule</b>: A Combine element defines how to resolve duplicate instances of the same control (e.g., controls with the same ID).</xs:documentation>
                </xs:annotation>
                <xs:attribute name="method" type="StringDatatype">
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Combination method</m:formal-name>
-                        <m:description>How clashing controls should be handled</m:description>
+                        <m:formal-name>Combination Method</m:formal-name>
+                        <m:description>Declare how clashing controls should be handled.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Combination method</b>: How clashing controls should be handled</xs:documentation>
+                        <b>Combination Method</b>: Declare how clashing controls should be handled.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -1800,11 +2188,11 @@
                <xs:complexType>
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Flat</m:formal-name>
-                        <m:description>Use the flat structuring method.</m:description>
+                        <m:formal-name>Flat Without Grouping</m:formal-name>
+                        <m:description>Directs that controls appear without any grouping structure.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Flat</b>: Use the flat structuring method.</xs:documentation>
+                        <b>Flat Without Grouping</b>: Directs that controls appear without any grouping structure.</xs:documentation>
                   </xs:annotation>
                </xs:complexType>
             </xs:element>
@@ -1812,34 +2200,34 @@
                <xs:simpleType>
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>As-Is Structuring Directive</m:formal-name>
-                        <m:description>An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.</m:description>
+                        <m:formal-name>Group As-Is</m:formal-name>
+                        <m:description>Indicates that the controls selected should retain their original grouping as defined in the import source.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>As-Is Structuring Directive</b>: An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.</xs:documentation>
+                        <b>Group As-Is</b>: Indicates that the controls selected should retain their original grouping as defined in the import source.</xs:documentation>
                   </xs:annotation>
                   <xs:restriction base="BooleanDatatype"/>
                </xs:simpleType>
             </xs:element>
-            <xs:element name="custom" minOccurs="0" maxOccurs="1">
+            <xs:element name="custom" minOccurs="1" maxOccurs="1">
                <xs:complexType>
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Custom grouping</m:formal-name>
-                        <m:description>A Custom element frames a structure for embedding represented controls in resolution.</m:description>
+                        <m:formal-name>Custom Grouping</m:formal-name>
+                        <m:description>Provides an alternate grouping structure that selected controls will be placed in.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Custom grouping</b>: A Custom element frames a structure for embedding represented controls in resolution.</xs:documentation>
+                        <b>Custom Grouping</b>: Provides an alternate grouping structure that selected controls will be placed in.</xs:documentation>
                   </xs:annotation>
                   <xs:sequence>
                      <xs:element name="group"
-                                 type="oscal-profile-group-ASSEMBLY"
-                                 minOccurs="0"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-profile-group-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
                      <xs:element name="insert-controls"
-                                 type="oscal-profile-insert-controls-ASSEMBLY"
-                                 minOccurs="0"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-profile-insert-controls-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
                   </xs:sequence>
                </xs:complexType>
             </xs:element>
@@ -1849,11 +2237,11 @@
    <xs:complexType name="oscal-profile-group-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Control group</m:formal-name>
-            <m:description>A group of (selected) controls or of groups of controls</m:description>
+            <m:formal-name>Control Group</m:formal-name>
+            <m:description>A group of (selected) controls or of groups of controls.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Control group</b>: A group of (selected) controls or of groups of controls</xs:documentation>
+            <b>Control Group</b>: A group of (selected) controls or of groups of controls.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -1861,10 +2249,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Group Title</m:formal-name>
-                     <m:description>A name given to the group, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>A name to be given to the group for use in display.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Group Title</b>: A name given to the group, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Group Title</b>: A name to be given to the group for use in display.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -1872,40 +2260,40 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="group"
-                        type="oscal-profile-group-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-group-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="insert-controls"
-                        type="oscal-profile-insert-controls-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-insert-controls-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
          </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Group Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined group elsewhere in <a href="/concepts/identifier-use/#profile-identifiers">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same group across revisions of the document.</m:description>
+               <m:description>Identifies the group.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Group Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.</xs:documentation>
+               <b>Group Identifier</b>: Identifies the group.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
@@ -1922,11 +2310,11 @@
    <xs:complexType name="oscal-profile-modify-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Modify controls</m:formal-name>
-            <m:description>Set parameters or amend controls in resolution</m:description>
+            <m:formal-name>Modify Controls</m:formal-name>
+            <m:description>Set parameters or amend controls in resolution.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Modify controls</b>: Set parameters or amend controls in resolution</xs:documentation>
+            <b>Modify Controls</b>: Set parameters or amend controls in resolution.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="set-parameter" minOccurs="0" maxOccurs="unbounded">
@@ -1934,20 +2322,20 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Setting</m:formal-name>
-                     <m:description>A parameter setting, to be propagated to points of insertion</m:description>
+                     <m:description>A parameter setting, to be propagated to points of insertion.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Setting</b>: A parameter setting, to be propagated to points of insertion</xs:documentation>
+                     <b>Parameter Setting</b>: A parameter setting, to be propagated to points of insertion.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="label" minOccurs="0" maxOccurs="1">
                      <xs:complexType mixed="true">
                         <xs:annotation>
@@ -1963,102 +2351,249 @@
                         </xs:complexContent>
                      </xs:complexType>
                   </xs:element>
-                  <xs:element name="usage" minOccurs="0" maxOccurs="1">
+                  <xs:element name="usage" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Parameter Usage Description</m:formal-name>
+                              <m:description>Describes the purpose and use of a parameter.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="constraint"
+                               type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="guideline"
+                               type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="value"
+                                  type="oscal-control-common-parameter-value-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="select"
+                                  type="oscal-control-common-parameter-selection-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="1"/>
+                  </xs:choice>
+               </xs:sequence>
+               <xs:attribute name="param-id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Parameter ID</m:formal-name>
+                        <m:description>An identifier for the parameter.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Parameter ID</b>: An identifier for the parameter.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="class" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Parameter Class</m:formal-name>
+                        <m:description>A textual label that provides a characterization of the parameter.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="depends-on" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Depends On</m:formal-name>
+                        <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Depends On</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="alter" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Alteration</m:formal-name>
+                     <m:description>Specifies changes to be made to an included control when a profile is resolved.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Alteration</b>: Specifies changes to be made to an included control when a profile is resolved.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="remove" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Removal</m:formal-name>
+                              <m:description>Specifies objects to be removed from a control based on specific aspects of the object that must all match.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Removal</b>: Specifies objects to be removed from a control based on specific aspects of the object that must all match.</xs:documentation>
+                        </xs:annotation>
+                        <xs:attribute name="by-name" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by (assigned) name</m:formal-name>
+                                 <m:description>Identify items remove by matching their assigned name.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by (assigned) name</b>: Identify items remove by matching their assigned name.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-class" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by class</m:formal-name>
+                                 <m:description>Identify items to remove by matching their <code>class</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by class</b>: Identify items to remove by matching their class.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-id" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by ID</m:formal-name>
+                                 <m:description>Identify items to remove indicated by their <code>id</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by ID</b>: Identify items to remove indicated by their id.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-item-name" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Item Name Reference</m:formal-name>
+                                 <m:description>Identify items to remove by the name of the item's information object name, e.g. <code>title</code> or <code>prop</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Item Name Reference</b>: Identify items to remove by the name of the item's information object name, e.g. title or prop.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-ns" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Item Namespace Reference</m:formal-name>
+                                 <m:description>Identify items to remove by the item's <code>ns</code>, which is the namespace associated with a <code>part</code>, or <code>prop</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Item Namespace Reference</b>: Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="add" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>Parameter Usage Description</m:formal-name>
-                              <m:description>Describes the purpose and use of a parameter</m:description>
+                              <m:formal-name>Addition</m:formal-name>
+                              <m:description>Specifies contents to be added into controls, in resolution.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                              <b>Addition</b>: Specifies contents to be added into controls, in resolution.</xs:documentation>
                         </xs:annotation>
-                        <xs:complexContent>
-                           <xs:extension base="MarkupMultilineDatatype"/>
-                        </xs:complexContent>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Title Change</m:formal-name>
+                                       <m:description>A name given to the control, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Title Change</b>: A name given to the control, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="param"
+                                        type="oscal-control-common-parameter-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="part"
+                                        type="oscal-control-common-part-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                        </xs:sequence>
+                        <xs:attribute name="position" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Position</m:formal-name>
+                                 <m:description>Where to add the new content with respect to the targeted element (beside it or inside it).</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Position</b>: Where to add the new content with respect to the targeted element (beside it or inside it).</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-id" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by ID</m:formal-name>
+                                 <m:description>Target location of the addition.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by ID</b>: Target location of the addition.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
                      </xs:complexType>
                   </xs:element>
-                  <xs:element name="constraint"
-                              type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-                  <xs:element name="guideline"
-                              type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-                  <xs:choice>
-                     <xs:element name="value"
-                                 type="oscal-catalog-common-parameter-value-FIELD"
-                                 minOccurs="0"
-                                 maxOccurs="unbounded"/>
-                     <xs:element name="select"
-                                 type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                                 minOccurs="0"
-                                 maxOccurs="1"/>
-                  </xs:choice>
                </xs:sequence>
-               <xs:attribute name="param-id" use="required" type="TokenDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Parameter ID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#profile-identifiers">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Parameter ID</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-               <xs:attribute name="class" type="TokenDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Parameter Class</m:formal-name>
-                        <m:description>A textual label that provides a characterization of the parameter.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-               <xs:attribute name="depends-on" type="TokenDatatype">
+               <xs:attribute name="control-id" use="required" type="TokenDatatype">
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Depends on</m:formal-name>
-                        <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+                        <m:formal-name>Control Identifier Reference</m:formal-name>
+                        <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+                        <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="alter"
-                     type="oscal-profile-alter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-profile-insert-controls-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Select controls</m:formal-name>
+            <m:formal-name>Insert Controls</m:formal-name>
             <m:description>Specifies which controls to use in the containing context.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Select controls</b>: Specifies which controls to use in the containing context.</xs:documentation>
+            <b>Insert Controls</b>: Specifies which controls to use in the containing context.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-controls"
-                        type="oscal-profile-select-control-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-select-control-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-controls"
-                     type="oscal-profile-select-control-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-profile-select-control-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="order" type="TokenDatatype">
          <xs:annotation>
@@ -2074,216 +2609,66 @@
    <xs:complexType name="oscal-profile-select-control-by-id-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Call</m:formal-name>
-            <m:description>Call a control by its ID</m:description>
+            <m:formal-name>Select Control</m:formal-name>
+            <m:description>Select a control or controls from an imported control set.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Call</b>: Call a control by its ID</xs:documentation>
+            <b>Select Control</b>: Select a control or controls from an imported control set.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
-         <xs:element name="with-id" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Match Controls by Identifier</m:formal-name>
-                     <m:description/>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Match Controls by Identifier</b>: </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="TokenDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="matching" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Match Controls by Pattern</m:formal-name>
-                     <m:description>Select controls by (regular expression) match on ID</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Match Controls by Pattern</b>: Select controls by (regular expression) match on ID</xs:documentation>
-               </xs:annotation>
-               <xs:attribute name="pattern" type="StringDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Pattern</m:formal-name>
-                        <m:description>A <a href="https://en.wikipedia.org/wiki/Glob_(programming)">glob expression</a> matching the IDs of one or more controls to be selected.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Pattern</b>: A glob expression matching the IDs of one or more controls to be selected.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-            </xs:complexType>
-         </xs:element>
+         <xs:element name="with-id"
+                      type="oscal-profile-with-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="matching"
+                      type="oscal-profile-matching-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="with-child-controls" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Include contained controls with control</m:formal-name>
+               <m:formal-name>Include Contained Controls with Control</m:formal-name>
                <m:description>When a control is included, whether its child (dependent) controls are also included.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Include contained controls with control</b>: When a control is included, whether its child (dependent) controls are also included.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:complexType name="oscal-profile-alter-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Alteration</m:formal-name>
-            <m:description>An Alter element specifies changes to be made to an included control when a profile is resolved.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Alteration</b>: An Alter element specifies changes to be made to an included control when a profile is resolved.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="remove"
-                     type="oscal-profile-remove-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="add"
-                     type="oscal-profile-add-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="control-id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Include Contained Controls with Control</b>: When a control is included, whether its child (dependent) controls are also included.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-profile-remove-ASSEMBLY">
+   <xs:simpleType name="oscal-profile-with-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Removal</m:formal-name>
-            <m:description>Specifies objects to be removed from a control based on specific aspects of the object that must all match.</m:description>
+            <m:formal-name>Match Controls by Identifier</m:formal-name>
+            <m:description>Selecting a control by its ID given as a literal.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Removal</b>: Specifies objects to be removed from a control based on specific aspects of the object that must all match.</xs:documentation>
+            <b>Match Controls by Identifier</b>: Selecting a control by its ID given as a literal.</xs:documentation>
       </xs:annotation>
-      <xs:attribute name="by-name" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Reference by (assigned) name</m:formal-name>
-               <m:description>Identify items to remove by matching their assigned name</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Reference by (assigned) name</b>: Identify items to remove by matching their assigned name</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-class" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Reference by class</m:formal-name>
-               <m:description>Identify items to remove by matching their <code>class</code>.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Reference by class</b>: Identify items to remove by matching their class.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-id" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Reference by ID</m:formal-name>
-               <m:description>Identify items to remove indicated by their <code>id</code>.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Reference by ID</b>: Identify items to remove indicated by their id.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-item-name" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Item Name Reference</m:formal-name>
-               <m:description>Identify items to remove by the name of the item's information element name, e.g. <code>title</code> or <code>prop</code>
-               </m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Item Name Reference</b>: Identify items to remove by the name of the item's information element name, e.g. title or prop</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-ns" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Item Namespace Reference</m:formal-name>
-               <m:description>Identify items to remove by the item's <code>ns</code>, which is the namespace associated with a <code>part</code>, or <code>prop</code>.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Item Namespace Reference</b>: Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:complexType name="oscal-profile-add-ASSEMBLY">
+      <xs:restriction base="TokenDatatype"/>
+   </xs:simpleType>
+   <xs:complexType name="oscal-profile-matching-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Addition</m:formal-name>
-            <m:description>Specifies contents to be added into controls, in resolution</m:description>
+            <m:formal-name>Match Controls by Pattern</m:formal-name>
+            <m:description>Selecting a set of controls by matching their IDs with a wildcard pattern.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Addition</b>: Specifies contents to be added into controls, in resolution</xs:documentation>
+            <b>Match Controls by Pattern</b>: Selecting a set of controls by matching their IDs with a wildcard pattern.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Title Change</m:formal-name>
-                     <m:description>A name given to the control, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Title Change</b>: A name given to the control, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="position" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Position</m:formal-name>
-               <m:description>Where to add the new content with respect to the targeted element (beside it or inside it)</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Position</b>: Where to add the new content with respect to the targeted element (beside it or inside it)</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-id" type="TokenDatatype">
+      <xs:attribute name="pattern" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Reference by ID</m:formal-name>
-               <m:description>Target location of the addition.</m:description>
+               <m:formal-name>Pattern</m:formal-name>
+               <m:description>A <a href="https://en.wikipedia.org/wiki/Glob_(programming)">glob expression</a> matching the IDs of one or more controls to be selected.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Reference by ID</b>: Target location of the addition.</xs:documentation>
+               <b>Pattern</b>: A glob expression matching the IDs of one or more controls to be selected.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
    <xs:element name="component-definition"
-               type="oscal-component-definition-component-definition-ASSEMBLY"/>
+                type="oscal-component-definition-component-definition-ASSEMBLY"/>
    <xs:complexType name="oscal-component-definition-component-definition-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -2295,34 +2680,34 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-component-definition"
-                     type="oscal-component-definition-import-component-definition-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-import-component-definition-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="component"
-                     type="oscal-component-definition-defined-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-defined-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="capability"
-                     type="oscal-component-definition-capability-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-capability-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Definition Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component definition elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component definition</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given component definition instance.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Component Definition Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component definition elsewhere in this or other OSCAL instances. The locally defined UUID of the component definition can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Component Definition Universally Unique Identifier</b>: Provides a globally unique means to identify a given component definition instance.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2402,33 +2787,33 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-implementation"
-                     type="oscal-component-definition-control-implementation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-control-implementation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2439,10 +2824,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given component.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Component Identifier</b>: Provides a globally unique means to identify a given component.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="type" use="required" type="StringDatatype">
@@ -2482,29 +2867,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="incorporates-component"
-                     type="oscal-component-definition-incorporates-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-incorporates-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-implementation"
-                     type="oscal-component-definition-control-implementation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-control-implementation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2515,10 +2900,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Capability Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this capability elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>capability</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given capability.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Capability Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this capability elsewhere in this or other OSCAL instances. The locally defined UUID of the capability can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Capability Identifier</b>: Provides a globally unique means to identify a given capability.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="StringDatatype">
@@ -2536,10 +2921,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Incorporates Component</m:formal-name>
-            <m:description>TBD</m:description>
+            <m:description>The collection of components comprising this capability.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Incorporates Component</b>: TBD</xs:documentation>
+            <b>Incorporates Component</b>: The collection of components comprising this capability.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="1" maxOccurs="1">
@@ -2562,7 +2947,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Reference</b>: A machine-oriented identifier reference to a component.</xs:documentation>
@@ -2595,30 +2980,30 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-requirement"
-                     type="oscal-component-definition-implemented-requirement-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-implemented-requirement-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Implementation Set Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference a set of implemented controls elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation set</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a means to identify a set of control implementations that are supported by a given component or capability.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Implementation Set Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a set of implemented controls elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation set can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Control Implementation Set Identifier</b>: Provides a means to identify a set of control implementations that are supported by a given component or capability.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="source" use="required" type="URIReferenceDatatype">
@@ -2647,10 +3032,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Control Implementation Description</m:formal-name>
-                     <m:description>A suggestion for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</m:description>
+                     <m:description>A suggestion from the supplier (e.g., component vendor or author) for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Control Implementation Description</b>: A suggestion for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</xs:documentation>
+                     <b>Control Implementation Description</b>: A suggestion from the supplier (e.g., component vendor or author) for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -2658,33 +3043,33 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="statement"
-                     type="oscal-component-definition-statement-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-statement-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2695,20 +3080,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Implementation Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference a specific control implementation elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given control implementation by a component.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Implementation Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a specific control implementation elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Control Implementation Identifier</b>: Provides a globally unique means to identify a given control implementation by a component.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="control-id" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2738,25 +3123,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2767,7 +3152,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference</b>: A human-oriented identifier reference to a control statement.</xs:documentation>
@@ -2777,7 +3162,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</xs:documentation>
@@ -2840,13 +3225,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -2862,10 +3247,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2885,21 +3270,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2910,7 +3295,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2953,15 +3338,15 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="port-range"
-                     type="oscal-implementation-common-port-range-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-port-range-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Service Protocol Information Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Service Protocol Information Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3032,10 +3417,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3107,29 +3492,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="role-id"
-                     type="oscal-metadata-role-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-role-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="authorized-privilege"
-                     type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3140,7 +3525,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>User Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>User Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3188,9 +3573,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="function-performed"
-                     type="oscal-implementation-common-function-performed-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-function-performed-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="oscal-implementation-common-function-performed-FIELD">
@@ -3230,17 +3615,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-component" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3253,25 +3638,25 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3282,7 +3667,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -3294,10 +3679,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3308,7 +3693,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Inventory Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Inventory Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3342,10 +3727,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3356,7 +3741,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Parameter ID</b>: A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.</xs:documentation>
@@ -3367,7 +3752,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Identification</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>System Identification</b>: A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.</xs:documentation>
@@ -3388,47 +3773,47 @@
       </xs:simpleContent>
    </xs:complexType>
    <xs:element name="system-security-plan"
-               type="oscal-ssp-system-security-plan-ASSEMBLY"/>
+                type="oscal-ssp-system-security-plan-ASSEMBLY"/>
    <xs:complexType name="oscal-ssp-system-security-plan-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Security Plan (SSP)</m:formal-name>
-            <m:description>A system security plan, such as those described in NIST SP 800-18</m:description>
+            <m:description>A system security plan, such as those described in NIST SP 800-18.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>System Security Plan (SSP)</b>: A system security plan, such as those described in NIST SP 800-18</xs:documentation>
+            <b>System Security Plan (SSP)</b>: A system security plan, such as those described in NIST SP 800-18.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-profile"
-                     type="oscal-ssp-import-profile-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-import-profile-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="system-characteristics"
-                     type="oscal-ssp-system-characteristics-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-system-characteristics-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="system-implementation"
-                     type="oscal-ssp-system-implementation-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-system-implementation-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="control-implementation"
-                     type="oscal-ssp-control-implementation-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-control-implementation-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>System Security Plan Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system security plan (SSP) elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>SSP</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system security plan (SSP) elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>SSP</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>System Security Plan Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3449,10 +3834,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3481,9 +3866,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="system-id"
-                     type="oscal-implementation-common-system-id-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-id-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="system-name" minOccurs="1" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -3526,66 +3911,66 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="date-authorized"
-                     type="oscal-ssp-date-authorized-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-date-authorized-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="security-sensitivity-level" minOccurs="1" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Security Sensitivity Level</m:formal-name>
-                     <m:description>The overall information system sensitivity categorization, such as defined by <a href="https://doi.org/10.6028/NIST.FIPS.199">FIPS-199</a>. </m:description>
+                     <m:description>The overall information system sensitivity categorization, such as defined by <a href="https://doi.org/10.6028/NIST.FIPS.199">FIPS-199</a>.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Security Sensitivity Level</b>: The overall information system sensitivity categorization, such as defined by FIPS-199. </xs:documentation>
+                     <b>Security Sensitivity Level</b>: The overall information system sensitivity categorization, such as defined by FIPS-199.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
          </xs:element>
          <xs:element name="system-information"
-                     type="oscal-ssp-system-information-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-system-information-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="security-impact-level"
-                     type="oscal-ssp-security-impact-level-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-security-impact-level-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="status"
-                     type="oscal-ssp-status-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-status-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="authorization-boundary"
-                     type="oscal-ssp-authorization-boundary-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-authorization-boundary-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="network-architecture"
-                     type="oscal-ssp-network-architecture-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-network-architecture-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="data-flow"
-                     type="oscal-ssp-data-flow-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-data-flow-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3597,29 +3982,29 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Information</m:formal-name>
-            <m:description>Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>. </m:description>
+            <m:description>Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>System Information</b>: Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60. </xs:documentation>
+            <b>System Information</b>: Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="information-type" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Information Type</m:formal-name>
-                     <m:description>Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>. </m:description>
+                     <m:description>Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Information Type</b>: Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60. </xs:documentation>
+                     <b>Information Type</b>: Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -3668,7 +4053,7 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Information Type Systematized Identifier</m:formal-name>
-                                       <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier qualified by the given identification <code>system</code> used, such as NIST SP 800-60. This identifier has <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this system elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                       <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier qualified by the given identification <code>system</code> used, such as NIST SP 800-60. This identifier has <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this system elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. This id should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
                                        <b>Information Type Systematized Identifier</b>: A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3690,148 +4075,31 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-                  <xs:element name="confidentiality-impact" minOccurs="1" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Confidentiality Impact Level</m:formal-name>
-                              <m:description>The expected level of impact resulting from the unauthorized disclosure of the described information.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Confidentiality Impact Level</b>: The expected level of impact resulting from the unauthorized disclosure of the described information.</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="base"
-                                       type="oscal-ssp-base-FIELD"
-                                       minOccurs="1"
-                                       maxOccurs="1"/>
-                           <xs:element name="selected"
-                                       type="oscal-ssp-selected-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
-                           <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
-                              <xs:annotation>
-                                 <xs:appinfo>
-                                    <m:formal-name>Adjustment Justification</m:formal-name>
-                                    <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
-                                 </xs:appinfo>
-                                 <xs:documentation>
-                                    <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
-                  <xs:element name="integrity-impact" minOccurs="1" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Integrity Impact Level</m:formal-name>
-                              <m:description>The expected level of impact resulting from the unauthorized modification of the described information.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Integrity Impact Level</b>: The expected level of impact resulting from the unauthorized modification of the described information.</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="base"
-                                       type="oscal-ssp-base-FIELD"
-                                       minOccurs="1"
-                                       maxOccurs="1"/>
-                           <xs:element name="selected"
-                                       type="oscal-ssp-selected-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
-                           <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
-                              <xs:annotation>
-                                 <xs:appinfo>
-                                    <m:formal-name>Adjustment Justification</m:formal-name>
-                                    <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
-                                 </xs:appinfo>
-                                 <xs:documentation>
-                                    <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
-                  <xs:element name="availability-impact" minOccurs="1" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Availability Impact Level</m:formal-name>
-                              <m:description>The expected level of impact resulting from the disruption of access to or use of the described information or the information system.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Availability Impact Level</b>: The expected level of impact resulting from the disruption of access to or use of the described information or the information system.</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="base"
-                                       type="oscal-ssp-base-FIELD"
-                                       minOccurs="1"
-                                       maxOccurs="1"/>
-                           <xs:element name="selected"
-                                       type="oscal-ssp-selected-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
-                           <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
-                              <xs:annotation>
-                                 <xs:appinfo>
-                                    <m:formal-name>Adjustment Justification</m:formal-name>
-                                    <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
-                                 </xs:appinfo>
-                                 <xs:documentation>
-                                    <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="confidentiality-impact"
+                               type="oscal-ssp-impact-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="integrity-impact"
+                               type="oscal-ssp-impact-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="availability-impact"
+                               type="oscal-ssp-impact-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                </xs:sequence>
                <xs:attribute name="uuid" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Information Type Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this information type elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>information type</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this information type elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>information type</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Information Type Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3841,6 +4109,47 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
+   <xs:complexType name="oscal-ssp-impact-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Impact Level</m:formal-name>
+            <m:description>The expected level of impact resulting from the described information.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Impact Level</b>: The expected level of impact resulting from the described information.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="base"
+                      type="oscal-ssp-base-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="selected"
+                      type="oscal-ssp-selected-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
+         <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Adjustment Justification</m:formal-name>
+                  <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:complexType>
    <xs:simpleType name="oscal-ssp-base-FIELD">
       <xs:annotation>
          <xs:appinfo>
@@ -3887,8 +4196,8 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="security-objective-confidentiality"
-                     minOccurs="1"
-                     maxOccurs="1">
+                      minOccurs="1"
+                      maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
@@ -3943,10 +4252,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4001,25 +4310,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="diagram"
-                     type="oscal-ssp-diagram-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-diagram-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4053,13 +4362,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="caption" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -4079,10 +4388,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4093,7 +4402,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Diagram ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this diagram elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>diagram</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this diagram elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>diagram</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Diagram ID</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4126,25 +4435,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="diagram"
-                     type="oscal-ssp-diagram-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-diagram-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4178,25 +4487,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="diagram"
-                     type="oscal-ssp-diagram-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-diagram-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4215,22 +4524,22 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="leveraged-authorization" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Leveraged Authorization</m:formal-name>
-                     <m:description>A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a <em>common control provider</em>. </m:description>
+                     <m:description>A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a <em>common control provider</em>.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Leveraged Authorization</b>: A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider. </xs:documentation>
+                     <b>Leveraged Authorization</b>: A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -4249,19 +4558,19 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="party-uuid" minOccurs="1" maxOccurs="1">
                      <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>party-uuid field</m:formal-name>
-                              <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>party</code> that manages the leveraged system.</m:description>
+                              <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>party</code> that manages the leveraged system.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
                               <b>party-uuid field</b>: A machine-oriented identifier reference to the party that manages the leveraged system.</xs:documentation>
@@ -4270,17 +4579,17 @@
                      </xs:simpleType>
                   </xs:element>
                   <xs:element name="date-authorized"
-                              type="oscal-ssp-date-authorized-FIELD"
-                              minOccurs="1"
-                              maxOccurs="1"/>
+                               type="oscal-ssp-date-authorized-FIELD"
+                               minOccurs="1"
+                               maxOccurs="1"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4291,7 +4600,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Leveraged Authorization Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this leveraged authorization elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>leveraged authorization</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this leveraged authorization elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>leveraged authorization</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Leveraged Authorization Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4300,25 +4609,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="user"
-                     type="oscal-implementation-common-system-user-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-user-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="inventory-item"
-                     type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4352,13 +4661,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-requirement"
-                     type="oscal-ssp-implemented-requirement-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-implemented-requirement-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-ssp-implemented-requirement-ASSEMBLY">
@@ -4372,37 +4681,37 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="statement"
-                     type="oscal-ssp-statement-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-statement-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="by-component"
-                     type="oscal-ssp-by-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-by-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4413,7 +4722,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Requirement Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control requirement elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control requirement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control requirement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control requirement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Requirement Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4423,10 +4732,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -4441,29 +4750,29 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="by-component"
-                     type="oscal-ssp-by-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-by-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4474,7 +4783,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference</b>: A human-oriented identifier reference to a control statement.</xs:documentation>
@@ -4484,7 +4793,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</xs:documentation>
@@ -4517,21 +4826,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implementation-status"
-                     type="oscal-implementation-common-implementation-status-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-implementation-status-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="export" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -4559,13 +4868,13 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="provided" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
@@ -4593,25 +4902,25 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-role"
-                                       type="oscal-metadata-responsible-role-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-role-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4622,7 +4931,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Provided Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this provided entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>provided</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this provided entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>provided</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Provided Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4657,25 +4966,25 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-role"
-                                       type="oscal-metadata-responsible-role-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-role-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4686,7 +4995,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Responsibility Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this responsibility elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>responsibility</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this responsibility elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>responsibility</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Responsibility Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4696,7 +5005,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Provided UUID</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Provided UUID</b>: A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</xs:documentation>
@@ -4708,10 +5017,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4747,23 +5056,23 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Inherited Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inherited entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inherited control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inherited entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inherited control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Inherited Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4773,7 +5082,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Provided UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Provided UUID</b>: A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</xs:documentation>
@@ -4808,25 +5117,25 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4837,7 +5146,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Satisfied Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this satisfied control implementation entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this satisfied control implementation entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Satisfied Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4847,7 +5156,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Responsibility UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Responsibility UUID</b>: A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.</xs:documentation>
@@ -4856,17 +5165,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4877,7 +5186,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>component</code> that is implemeting a given control.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>component</code> that is implemeting a given control.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to the component that is implemeting a given control.</xs:documentation>
@@ -4887,7 +5196,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>By-Component Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this by-component entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>by-component</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this by-component entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>by-component</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>By-Component Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4906,13 +5215,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-ssp"
-                     type="oscal-assessment-common-import-ssp-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-import-ssp-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="local-definitions" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -4925,33 +5234,33 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="component"
-                              type="oscal-implementation-common-system-component-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-component-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="inventory-item"
-                              type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="user"
-                              type="oscal-implementation-common-system-user-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-user-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="objectives-and-methods"
-                              type="oscal-assessment-common-local-objective-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-local-objective-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="activity"
-                              type="oscal-assessment-common-activity-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-activity-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4972,38 +5281,38 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="part"
-                              type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
          <xs:element name="reviewed-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="assessment-subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="assessment-assets"
-                     type="oscal-assessment-common-assessment-assets-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-assessment-assets-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Plan Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment plan in <a href="/concepts/identifier-use/#ap-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment plan</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment plan in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ap-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment plan</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Plan Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment plan in this or other OSCAL instances. The locally defined UUID of the assessment plan can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5024,10 +5333,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5071,25 +5380,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5100,10 +5409,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -5133,25 +5442,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5162,7 +5471,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Method Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Method Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5210,13 +5519,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="step" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -5259,29 +5568,29 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="reviewed-controls"
-                              type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="1"/>
+                               type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5292,7 +5601,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Step Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Step Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5301,21 +5610,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="related-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5326,7 +5635,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Activity Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Activity Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5374,13 +5683,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="timing" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -5498,10 +5807,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5512,7 +5821,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -5521,9 +5830,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="associated-activity" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -5536,29 +5845,29 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5569,7 +5878,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Activity Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Activity Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an activity defined in the list of activities.</xs:documentation>
@@ -5578,21 +5887,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5603,7 +5912,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5646,13 +5955,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-selection" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -5680,35 +5989,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-control"
-                                 type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-control"
-                              type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5718,8 +6027,8 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="control-objective-selection"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
+                      minOccurs="0"
+                      maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
@@ -5746,35 +6055,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-objective"
-                                 type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-objective"
-                              type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5787,10 +6096,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5826,10 +6135,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -5892,7 +6201,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5901,21 +6210,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -5926,7 +6235,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Subject Placeholder Universally Unique Identifier</b>: A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -5959,35 +6268,35 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-subject"
-                        type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-subject"
-                     type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6016,21 +6325,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6041,7 +6350,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -6062,7 +6371,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Identifies the Subject</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>Identifies the Subject</b>: A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</xs:documentation>
@@ -6084,21 +6393,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6109,7 +6418,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -6137,9 +6446,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="assessment-platform" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -6167,13 +6476,13 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="uses-component" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
@@ -6186,25 +6495,25 @@
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-party"
-                                       type="oscal-metadata-responsible-party-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-party-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6215,7 +6524,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -6227,10 +6536,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6241,7 +6550,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Platform Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Platform Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -6292,13 +6601,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -6314,10 +6623,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6347,17 +6656,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
-                     type="oscal-implementation-common-implementation-status-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-implementation-status-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6378,13 +6687,151 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Finding Target Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Finding Target Identifier Reference</b>: A machine-oriented identifier reference for a specific target qualified by the type.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
+   <xs:complexType name="oscal-assessment-common-finding-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Finding</m:formal-name>
+            <m:description>Describes an individual finding.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Finding</b>: Describes an individual finding.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="title" minOccurs="1" maxOccurs="1">
+            <xs:complexType mixed="true">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Title</m:formal-name>
+                     <m:description>The title for this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Title</b>: The title for this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupLineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="description" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Description</m:formal-name>
+                     <m:description>A human-readable description of this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Description</b>: A human-readable description of this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupMultilineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="origin"
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-assessment-common-finding-target-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="implementation-statement-uuid" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Implementation Statement UUID</m:formal-name>
+                     <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the implementation statement in the SSP to which this finding is related.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Implementation Statement UUID</b>: A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="UUIDDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Related Observation</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced observations that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Related Observation</b>: Relates the finding to a set of referenced observations that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="observation-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="associated-risk" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Associated Risk</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced risks that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Associated Risk</b>: Relates the finding to a set of referenced risks that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="risk-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Finding Universally Unique Identifier</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this finding in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>finding</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Finding Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
    <xs:complexType name="oscal-assessment-common-observation-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -6426,13 +6873,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="method" minOccurs="1" maxOccurs="unbounded">
             <xs:simpleType>
                <xs:annotation>
@@ -6460,13 +6907,13 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="relevant-evidence" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -6494,21 +6941,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6557,10 +7004,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6571,7 +7018,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Observation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Observation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -6589,13 +7036,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="actor"
-                     type="oscal-assessment-common-origin-actor-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-actor-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="related-task"
-                     type="oscal-assessment-common-related-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-related-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-assessment-common-origin-actor-ASSEMBLY">
@@ -6609,13 +7056,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="type" use="required" type="TokenDatatype">
          <xs:annotation>
@@ -6631,7 +7078,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Actor Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Actor Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to the tool or person based on the associated type.</xs:documentation>
@@ -6659,21 +7106,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="identified-subject" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -6686,15 +7133,15 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="subject-placeholder-uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Subject Placeholder Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.</xs:documentation>
@@ -6706,10 +7153,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -6720,7 +7167,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -6817,29 +7264,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status"
-                     type="oscal-assessment-common-risk-status-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-risk-status-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="threat-id"
-                     type="oscal-assessment-common-threat-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-threat-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="characterization"
-                     type="oscal-assessment-common-characterization-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-characterization-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="mitigating-factor" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -6867,23 +7314,23 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Mitigating Factor Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Mitigating Factor Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -6893,7 +7340,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Implementation UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Implementation UUID</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -6915,9 +7362,9 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="response"
-                     type="oscal-assessment-common-response-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-response-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk-log" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -6997,21 +7444,21 @@
                               </xs:simpleType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="logged-by"
-                                       type="oscal-assessment-common-logged-by-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-logged-by-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="status-change"
-                                       type="oscal-assessment-common-risk-status-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
+                                        type="oscal-assessment-common-risk-status-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
                            <xs:element name="related-response" minOccurs="0" maxOccurs="unbounded">
                               <xs:complexType>
                                  <xs:annotation>
@@ -7024,25 +7471,25 @@
                                  </xs:annotation>
                                  <xs:sequence>
                                     <xs:element name="prop"
-                                                type="oscal-metadata-property-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-property-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="link"
-                                                type="oscal-metadata-link-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-link-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="related-task"
-                                                type="oscal-assessment-common-related-task-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-assessment-common-related-task-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                                        <xs:annotation>
                                           <xs:appinfo>
                                              <m:formal-name>Remarks</m:formal-name>
-                                             <m:description>Additional commentary on the containing object.</m:description>
+                                             <m:description>Additional commentary about the containing object.</m:description>
                                           </xs:appinfo>
                                           <xs:documentation>
-                                             <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                             <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                                        </xs:annotation>
                                        <xs:complexType>
                                           <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7053,7 +7500,7 @@
                                     <xs:annotation>
                                        <xs:appinfo>
                                           <m:formal-name>Response Universally Unique Identifier Reference</m:formal-name>
-                                          <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
+                                          <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
                                        </xs:appinfo>
                                        <xs:documentation>
                                           <b>Response Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique risk response.</xs:documentation>
@@ -7065,10 +7512,10 @@
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7079,7 +7526,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Risk Log Entry Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Risk Log Entry Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7104,7 +7551,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
@@ -7117,7 +7564,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Risk Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Risk Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7137,7 +7584,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Party UUID Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Party UUID Reference</b>: A machine-oriented identifier reference to the party who is making the log entry.</xs:documentation>
@@ -7176,17 +7623,17 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="facet" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -7199,21 +7646,21 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7295,17 +7742,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="required-asset" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -7318,9 +7765,9 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
                      <xs:complexType mixed="true">
                         <xs:annotation>
@@ -7352,21 +7799,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7377,7 +7824,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Required Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Required Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7386,17 +7833,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7407,7 +7854,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Remediation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Remediation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7450,24 +7897,24 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Part Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7516,13 +7963,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-ap"
-                     type="oscal-ar-import-ap-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ar-import-ap-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="local-definitions" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -7535,21 +7982,21 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="objectives-and-methods"
-                              type="oscal-assessment-common-local-objective-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-local-objective-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="activity"
-                              type="oscal-assessment-common-activity-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-activity-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7559,19 +8006,19 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="result"
-                     type="oscal-ar-result-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ar-result-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Results Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment results instance in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment results instance in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Results Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment results instance in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7645,13 +8092,13 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="local-definitions" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -7664,32 +8111,32 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="component"
-                              type="oscal-implementation-common-system-component-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-component-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="inventory-item"
-                              type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="user"
-                              type="oscal-implementation-common-system-user-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-implementation-common-system-user-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="assessment-assets"
-                              type="oscal-assessment-common-assessment-assets-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="1"/>
+                               type="oscal-assessment-common-assessment-assets-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                   <xs:element name="assessment-task"
-                              type="oscal-assessment-common-task-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-task-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
          <xs:element name="reviewed-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="attestation" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -7702,13 +8149,13 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="part"
-                              type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
@@ -7791,29 +8238,29 @@
                               </xs:simpleType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="logged-by"
-                                       type="oscal-assessment-common-logged-by-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-logged-by-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="related-task"
-                                       type="oscal-assessment-common-related-task-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-related-task-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7824,7 +8271,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Assessment Log Entry Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference an assessment event in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference an assessment event in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Assessment Log Entry Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference an assessment event in this or other OSCAL instances. The locally defined UUID of the assessment log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -7836,25 +8283,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="observation"
-                     type="oscal-assessment-common-observation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-observation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk"
-                     type="oscal-assessment-common-risk-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-risk-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="finding"
-                     type="oscal-ar-finding-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-finding-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -7865,151 +8312,13 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Results Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this set of results in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this set of results in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment result</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Results Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this set of results in this or other OSCAL instances. The locally defined UUID of the assessment result can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-ar-finding-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Finding</m:formal-name>
-            <m:description>Describes an individual finding.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Finding</b>: Describes an individual finding.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Finding Title</m:formal-name>
-                     <m:description>The title for this finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Finding Title</b>: The title for this finding.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="description" minOccurs="1" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Finding Description</m:formal-name>
-                     <m:description>A human-readable description of this finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Finding Description</b>: A human-readable description of this finding.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="target"
-                     type="oscal-assessment-common-finding-target-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="implementation-statement-uuid" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Implementation Statement UUID</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the implementation statement in the SSP to which this finding is related.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Implementation Statement UUID</b>: A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Related Observation</m:formal-name>
-                     <m:description>Relates the finding to a set of referenced observations that were used to determine the finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Related Observation</b>: Relates the finding to a set of referenced observations that were used to determine the finding.</xs:documentation>
-               </xs:annotation>
-               <xs:attribute name="observation-uuid" use="required" type="UUIDDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="associated-risk" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Associated Risk</m:formal-name>
-                     <m:description>Relates the finding to a set of referenced risks that were used to determine the finding.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Associated Risk</b>: Relates the finding to a set of referenced risks that were used to determine the finding.</xs:documentation>
-               </xs:annotation>
-               <xs:attribute name="risk-uuid" use="required" type="UUIDDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Finding Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this finding in <a href="/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>finding</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Finding Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
    <xs:complexType name="oscal-ar-import-ap-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -8024,10 +8333,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -8046,7 +8355,7 @@
       </xs:attribute>
    </xs:complexType>
    <xs:element name="plan-of-action-and-milestones"
-               type="oscal-poam-plan-of-action-and-milestones-ASSEMBLY"/>
+                type="oscal-poam-plan-of-action-and-milestones-ASSEMBLY"/>
    <xs:complexType name="oscal-poam-plan-of-action-and-milestones-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -8058,43 +8367,47 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-ssp"
-                     type="oscal-assessment-common-import-ssp-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-import-ssp-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="system-id"
-                     type="oscal-implementation-common-system-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-system-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="local-definitions"
-                     type="oscal-poam-local-definitions-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-poam-local-definitions-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="observation"
-                     type="oscal-assessment-common-observation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-observation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk"
-                     type="oscal-assessment-common-risk-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-risk-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="finding"
+                      type="oscal-assessment-common-finding-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="poam-item"
-                     type="oscal-poam-poam-item-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-poam-poam-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>POA&amp;M Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#instance">instance</a>scope that can be used to reference this POA&amp;M instance in <a href="/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#instance">instance</a>scope that can be used to reference this POA&amp;M instance in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>POA&amp;M Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&amp;M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -8112,21 +8425,25 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="inventory-item"
-                     type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="assessment-assets"
+                      type="oscal-assessment-common-assessment-assets-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -8175,13 +8492,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -8194,12 +8511,34 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="actor"
-                              type="oscal-assessment-common-origin-actor-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-origin-actor-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
+         <xs:element name="related-finding" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Related Finding</m:formal-name>
+                     <m:description>Relates the poam-item to referenced finding(s).</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Related Finding</b>: Relates the poam-item to referenced finding(s).</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="finding-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Finding Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a finding defined in the list of findings.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Finding Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a finding defined in the list of findings.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
          <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -8214,7 +8553,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
@@ -8236,7 +8575,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
@@ -8248,10 +8587,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -8262,7 +8601,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>POA&amp;M Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#instance">instance</a> scope that can be used to reference this POA&amp;M item entry in <a href="/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#instance">instance</a> scope that can be used to reference this POA&amp;M item entry in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>POA&amp;M Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&amp;M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -8316,9 +8655,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_component_schema.xsd b/xml/schema/oscal_component_schema.xsd
index 26515954b6..c758ff21d7 100644
--- a/xml/schema/oscal_component_schema.xsd
+++ b/xml/schema/oscal_component_schema.xsd
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Component Definition Model</m:schema-name>
          <m:schema-version>1.0.6</m:schema-version>
          <m:short-name>oscal-component-definition</m:short-name>
          <m:remarks>
-            <p>The OSCAL Component Definition Model can be used to describe the implementation of controls in a <code>component</code> or a set of components grouped as a <code>capability</code>. A component can be either a <em>technical component</em>, or a <em>documentary component</em>. A technical component is a component that is implemented in hardware (physical or virtual) or software. A documentary component is a component implemented in a document, such as a process, procedure, or policy.</p>
-            <p>The root of the OSCAL Implementation Component format is <code>component-definition</code>. </p>
-            <p>NOTE: This documentation is a work in progress. As a result, documentation for many of the information elements is missing or incomplete.</p>
+            <p>The OSCAL Component Definition Model can be used to describe the implementation of controls in a <code>component</code> or a set of components grouped as a <code>capability</code>. A component can be either a <em>technical component</em>, or a <em>documentary component</em>.</p>
+            <p>A technical component is a component that is implemented in hardware (physical or virtual) or software. Suppliers may document components in an OSCAL component definition that describes the implementation of controls in their hardware and software.</p>
+            <p>A documentary component is a component implemented for a documented process, procedure, or policy. Suppliers may document components in an OSCAL component definition that describes the implementation of controls in their process, procedure, or policy.</p>
+            <p>The information provided by a technical or documentary component can be used by component consumers to provide starting narratives for documenting control implementations in an OSCAL SSP.</p>
+            <p>The root of the OSCAL Implementation Layer Component Definition model is <code>component-definition</code>.</p>
          </m:remarks>
          <m:root>component-definition</m:root>
       </xs:appinfo>
    </xs:annotation>
    <xs:element name="component-definition"
-               type="oscal-component-definition-component-definition-ASSEMBLY"/>
+                type="oscal-component-definition-component-definition-ASSEMBLY"/>
    <xs:complexType name="oscal-component-definition-component-definition-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -32,34 +34,34 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-component-definition"
-                     type="oscal-component-definition-import-component-definition-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-import-component-definition-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="component"
-                     type="oscal-component-definition-defined-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-defined-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="capability"
-                     type="oscal-component-definition-capability-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-capability-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Definition Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component definition elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component definition</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given component definition instance.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Component Definition Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component definition elsewhere in this or other OSCAL instances. The locally defined UUID of the component definition can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Component Definition Universally Unique Identifier</b>: Provides a globally unique means to identify a given component definition instance.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -139,33 +141,33 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-implementation"
-                     type="oscal-component-definition-control-implementation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-control-implementation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -176,10 +178,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given component.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Component Identifier</b>: Provides a globally unique means to identify a given component.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="type" use="required" type="StringDatatype">
@@ -219,29 +221,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="incorporates-component"
-                     type="oscal-component-definition-incorporates-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-incorporates-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-implementation"
-                     type="oscal-component-definition-control-implementation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-control-implementation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -252,10 +254,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Capability Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this capability elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>capability</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given capability.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Capability Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this capability elsewhere in this or other OSCAL instances. The locally defined UUID of the capability can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Capability Identifier</b>: Provides a globally unique means to identify a given capability.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="StringDatatype">
@@ -273,10 +275,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Incorporates Component</m:formal-name>
-            <m:description>TBD</m:description>
+            <m:description>The collection of components comprising this capability.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Incorporates Component</b>: TBD</xs:documentation>
+            <b>Incorporates Component</b>: The collection of components comprising this capability.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="1" maxOccurs="1">
@@ -299,7 +301,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Reference</b>: A machine-oriented identifier reference to a component.</xs:documentation>
@@ -332,30 +334,30 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-requirement"
-                     type="oscal-component-definition-implemented-requirement-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-implemented-requirement-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Implementation Set Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference a set of implemented controls elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation set</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a means to identify a set of control implementations that are supported by a given component or capability.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Implementation Set Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a set of implemented controls elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation set can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Control Implementation Set Identifier</b>: Provides a means to identify a set of control implementations that are supported by a given component or capability.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="source" use="required" type="URIReferenceDatatype">
@@ -384,10 +386,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Control Implementation Description</m:formal-name>
-                     <m:description>A suggestion for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</m:description>
+                     <m:description>A suggestion from the supplier (e.g., component vendor or author) for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Control Implementation Description</b>: A suggestion for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</xs:documentation>
+                     <b>Control Implementation Description</b>: A suggestion from the supplier (e.g., component vendor or author) for how the specified control may be implemented if the containing component or capability is instantiated in a system security plan.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -395,33 +397,33 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="statement"
-                     type="oscal-component-definition-statement-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-component-definition-statement-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -432,20 +434,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Implementation Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference a specific control implementation elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given control implementation by a component.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Implementation Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference a specific control implementation elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Control Implementation Identifier</b>: Provides a globally unique means to identify a given control implementation by a component.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="control-id" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -475,25 +477,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -504,7 +506,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference</b>: A human-oriented identifier reference to a control statement.</xs:documentation>
@@ -514,7 +516,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#component-definition-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</xs:documentation>
@@ -577,13 +579,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -599,10 +601,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -622,21 +624,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -647,7 +649,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -690,15 +692,15 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="port-range"
-                     type="oscal-implementation-common-port-range-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-port-range-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Service Protocol Information Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Service Protocol Information Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -769,10 +771,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -844,29 +846,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="role-id"
-                     type="oscal-metadata-role-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-role-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="authorized-privilege"
-                     type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -877,7 +879,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>User Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>User Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -925,9 +927,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="function-performed"
-                     type="oscal-implementation-common-function-performed-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-function-performed-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="oscal-implementation-common-function-performed-FIELD">
@@ -967,17 +969,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-component" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -990,25 +992,25 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1019,7 +1021,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -1031,10 +1033,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1045,7 +1047,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Inventory Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Inventory Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1079,10 +1081,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1093,7 +1095,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Parameter ID</b>: A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.</xs:documentation>
@@ -1104,7 +1106,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Identification</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>System Identification</b>: A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.</xs:documentation>
@@ -1127,11 +1129,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -1150,473 +1152,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -1624,10 +1630,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -1635,10 +1641,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -1646,10 +1652,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -1661,10 +1667,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -1672,22 +1678,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -1706,13 +1712,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -1721,35 +1727,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -1759,14 +1765,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -1780,10 +1786,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -1794,10 +1800,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1808,10 +1814,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -1822,20 +1828,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1846,20 +1852,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -1886,10 +1892,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1897,10 +1913,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -1932,21 +1948,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1954,32 +1980,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1990,10 +2016,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2001,32 +2104,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2037,10 +2140,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2059,10 +2162,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -2072,10 +2175,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -2085,10 +2188,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -2096,10 +2199,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -2107,21 +2210,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -2129,10 +2232,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -2140,10 +2243,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -2171,9 +2274,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -2192,10 +2295,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -2205,10 +2308,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -2253,10 +2356,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -2264,23 +2367,23 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
       </xs:simpleContent>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -2288,10 +2391,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -2299,61 +2402,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -2364,13 +2467,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -2391,10 +2494,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -2402,31 +2505,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2437,41 +2540,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -2505,10 +2609,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -2517,10 +2621,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2531,7 +2635,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -2544,7 +2648,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -2555,14 +2659,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -2592,7 +2696,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -2649,9 +2753,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_mapping_schema.xsd b/xml/schema/oscal_mapping_schema.xsd
new file mode 100644
index 0000000000..64482c8c64
--- /dev/null
+++ b/xml/schema/oscal_mapping_schema.xsd
@@ -0,0 +1,1812 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.3">
+   <xs:annotation>
+      <xs:appinfo>
+         <m:schema-name>OSCAL Control Mapping Model</m:schema-name>
+         <m:schema-version>1.0.3</m:schema-version>
+         <m:short-name>oscal-mapping</m:short-name>
+         <m:remarks>
+            <p>The OSCAL Control mapping format can be used to describe how a collection of security controls and related control enhancements relate to another collection of controls. The root of the Control Catalog format is <code>mapping-collection</code>. </p>
+         </m:remarks>
+         <m:root>mapping-collection</m:root>
+      </xs:appinfo>
+   </xs:annotation>
+   <xs:element name="mapping-collection"
+                type="oscal-mapping-mapping-collection-ASSEMBLY"/>
+   <xs:complexType name="oscal-mapping-mapping-collection-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Collection</m:formal-name>
+            <m:description>A collection of relationship-based control and/or control statement mappings.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Collection</b>: A collection of relationship-based control and/or control statement mappings.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="metadata"
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="mapping"
+                      type="oscal-mapping-mapping-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="back-matter"
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Collection Universally Unique Identifier</m:formal-name>
+               <m:description>A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Collection Universally Unique Identifier</b>: A globally unique identifier with cross-instance scope for this catalog instance. This UUID should be changed when this document is revised.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-mapping-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Control Mapping</m:formal-name>
+            <m:description>A mapping between two target resources.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Control Mapping</b>: A mapping between two target resources.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="source-resource"
+                      type="oscal-mapping-common-mapping-resource-reference-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="target-resource"
+                      type="oscal-mapping-common-mapping-resource-reference-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="map"
+                      type="oscal-mapping-common-map-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Universally Unique Identifier</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>mapping</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same mapping across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mapping definition elsewhere in this or other OSCAL instances. The locally defined UUID of the mapping can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same mapping across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="title" minOccurs="1" maxOccurs="1">
+            <xs:complexType mixed="true">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Document Title</m:formal-name>
+                     <m:description>A name given to the document, which may be used by a tool for display and navigation.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Document Title</b>: A name given to the document, which may be used by a tool for display and navigation.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupLineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="published"
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
+         <xs:element name="last-modified"
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="version"
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="oscal-version"
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="revisions" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-role-id-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Role Identifier Reference</m:formal-name>
+            <m:description>Reference to a role by UUID.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="TokenDatatype"/>
+   </xs:simpleType>
+   <xs:complexType name="oscal-metadata-back-matter-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Back matter</m:formal-name>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Resource</m:formal-name>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Resource Title</m:formal-name>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Resource Description</m:formal-name>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="document-id"
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="citation" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Citation</m:formal-name>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="text" minOccurs="1" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Citation Text</m:formal-name>
+                                       <m:description>A line of citation text.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Citation Text</b>: A line of citation text.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="rlink" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Resource link</m:formal-name>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="hash"
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                        </xs:sequence>
+                        <xs:attribute name="href" use="required" type="URIReferenceDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Hypertext Reference</m:formal-name>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="media-type" type="StringDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Media Type</m:formal-name>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="base64" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Base64</m:formal-name>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="Base64Datatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>File Name</m:formal-name>
+                                       <m:description>Name of the file before it was encoded as Base64 to be embedded in a <code>resource</code>. This is the name that will be assigned to the file when the file is decoded.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>File Name</b>: Name of the file before it was encoded as Base64 to be embedded in a resource. This is the name that will be assigned to the file when the file is decoded.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                              <xs:attribute name="media-type" type="StringDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Media Type</m:formal-name>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for a resource.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-property-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Property</m:formal-name>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Name</m:formal-name>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="uuid" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier for a property.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="ns" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Namespace</m:formal-name>
+               <m:description>A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Namespace</b>: A namespace qualifying the property's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="value" use="required" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Value</m:formal-name>
+               <m:description>Indicates the value of the attribute, characteristic, or quality.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Value</b>: Indicates the value of the attribute, characteristic, or quality.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="class" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Class</m:formal-name>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-link-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Link</m:formal-name>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="text" minOccurs="0" maxOccurs="1">
+            <xs:complexType mixed="true">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Link Text</m:formal-name>
+                     <m:description>A textual label to associate with the link, which may be used for presentation in a tool.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Link Text</b>: A textual label to associate with the link, which may be used for presentation in a tool.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupLineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="href" use="required" type="URIReferenceDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Hypertext Reference</m:formal-name>
+               <m:description>A resolvable URL reference to a resource.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Hypertext Reference</b>: A resolvable URL reference to a resource.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="rel" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="media-type" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Media Type</m:formal-name>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-responsible-party-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Responsible Party</m:formal-name>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="party-uuid"
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="role-id" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Responsible Role</m:formal-name>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-responsible-role-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Responsible Role</m:formal-name>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="party-uuid"
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="role-id" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Responsible Role ID</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-hash-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Hash</m:formal-name>
+            <m:description>A representation of a cryptographic digest generated over a resource using a specified hash algorithm.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Hash</b>: A representation of a cryptographic digest generated over a resource using a specified hash algorithm.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:extension base="StringDatatype">
+            <xs:attribute name="algorithm" use="required" type="StringDatatype">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Hash algorithm</m:formal-name>
+                     <m:description>The digest method by which a hash is derived.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
+               </xs:annotation>
+            </xs:attribute>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-remarks-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Remarks</m:formal-name>
+            <m:description>Additional commentary about the containing object.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+      </xs:annotation>
+      <xs:complexContent>
+         <xs:extension base="MarkupMultilineDatatype"/>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:simpleType name="oscal-metadata-published-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Publication Timestamp</m:formal-name>
+            <m:description>The date and time the document was last made available.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="DateTimeWithTimezoneDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-last-modified-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Last Modified Timestamp</m:formal-name>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="DateTimeWithTimezoneDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-version-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Document Version</m:formal-name>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="StringDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="StringDatatype"/>
+   </xs:simpleType>
+   <xs:simpleType name="oscal-metadata-email-address-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Email Address</m:formal-name>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="EmailAddressDatatype"/>
+   </xs:simpleType>
+   <xs:complexType name="oscal-metadata-telephone-number-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Telephone Number</m:formal-name>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:extension base="StringDatatype">
+            <xs:attribute name="type" type="StringDatatype">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>type flag</m:formal-name>
+                     <m:description>Indicates the type of phone number.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>type flag</b>: Indicates the type of phone number.</xs:documentation>
+               </xs:annotation>
+            </xs:attribute>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-address-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Address</m:formal-name>
+            <m:description>A postal address for the location.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Address</b>: A postal address for the location.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="addr-line"
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="city" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>City</m:formal-name>
+                     <m:description>City, town or geographical region for the mailing address.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>City</b>: City, town or geographical region for the mailing address.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="StringDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="state" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>State</m:formal-name>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="StringDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="postal-code" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Postal Code</m:formal-name>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="StringDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="country" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Country Code</m:formal-name>
+                     <m:description>The ISO 3166-1 alpha-2 country code for the mailing address.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Country Code</b>: The ISO 3166-1 alpha-2 country code for the mailing address.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="StringDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Address Type</m:formal-name>
+               <m:description>Indicates the type of address.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Address Type</b>: Indicates the type of address.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:simpleType name="oscal-metadata-addr-line-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Address line</m:formal-name>
+            <m:description>A single line of an address.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Address line</b>: A single line of an address.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="StringDatatype"/>
+   </xs:simpleType>
+   <xs:complexType name="oscal-metadata-document-id-FIELD">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Document Identifier</m:formal-name>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
+      </xs:annotation>
+      <xs:simpleContent>
+         <xs:extension base="StringDatatype">
+            <xs:attribute name="scheme" type="URIDatatype">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Document Identification Scheme</m:formal-name>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
+               </xs:annotation>
+            </xs:attribute>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-map-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Entry</m:formal-name>
+            <m:description>A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Entry</b>: A relationship-based mapping between a source and target set consisting of members (i.e., controls, control statements) from the respective source and target.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="relationship" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Mapping Entry Relationship</m:formal-name>
+                     <m:description>The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Mapping Entry Relationship</b>: The relationship type for the mapping entry, which describes the relationship between the effective requirements of the specified source and target sets.</xs:documentation>
+               </xs:annotation>
+               <xs:simpleContent>
+                  <xs:extension base="TokenDatatype">
+                     <xs:attribute name="ns" type="URIDatatype">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Relationship Value Namespace</m:formal-name>
+                              <m:description>A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Relationship Value Namespace</b>: A namespace qualifying the relationship's value. This allows different organizations to associate distinct semantics for relationships with the same name.</xs:documentation>
+                        </xs:annotation>
+                     </xs:attribute>
+                  </xs:extension>
+               </xs:simpleContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="source"
+                      type="oscal-mapping-common-mapping-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-mapping-common-mapping-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Mapping Entry Identifier</m:formal-name>
+               <m:description>The unique identifier for the mapping entry.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Mapping Entry Identifier</b>: The unique identifier for the mapping entry.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-mapping-item-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapping Entry Item (source or target)</m:formal-name>
+            <m:description>Identifies a specific edge within a source or target that is the subject of a mapping.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapping Entry Item (source or target)</b>: Identifies a specific edge within a source or target that is the subject of a mapping.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Subject Type</m:formal-name>
+               <m:description>The semantic type of the subject.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Subject Type</b>: The semantic type of the subject.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="id-ref" use="required" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Subject Identifier Reference</m:formal-name>
+               <m:description>A reference to an identified subject that is of the specified <code>type</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Subject Identifier Reference</b>: A reference to an identified subject that is of the specified type.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-mapping-common-mapping-resource-reference-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Mapped Resource Reference</m:formal-name>
+            <m:description>A reference to a resource that is either the source or target of a mapping.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Mapped Resource Reference</b>: A reference to a resource that is either the source or target of a mapping.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Type</m:formal-name>
+               <m:description>The semantic type of the resource.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Resource Type</b>: The semantic type of the resource.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="href" use="required" type="URIReferenceDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Catalog or Profile Reference</m:formal-name>
+               <m:description>A resolvable URL reference to the base catalog or profile that this profile is tailoring.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Catalog or Profile Reference</b>: A resolvable URL reference to the base catalog or profile that this profile is tailoring.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="MarkupMultilineDatatype">
+      <xs:choice minOccurs="1" maxOccurs="unbounded">
+         <xs:group ref="blockElementGroup"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:group name="headingBlockElementGroup">
+      <xs:choice>
+         <xs:element name="h1" type="inlineMarkupType"/>
+         <xs:element name="h2" type="inlineMarkupType"/>
+         <xs:element name="h3" type="inlineMarkupType"/>
+         <xs:element name="h4" type="inlineMarkupType"/>
+         <xs:element name="h5" type="inlineMarkupType"/>
+         <xs:element name="h6" type="inlineMarkupType"/>
+      </xs:choice>
+   </xs:group>
+   <xs:group name="blockElementGroup">
+      <xs:choice>
+         <xs:group ref="headingBlockElementGroup"/>
+         <xs:group ref="listsGroup"/>
+         <xs:group ref="blockTextGroup"/>
+         <xs:element name="p" type="inlineMarkupType"/>
+         <xs:element name="table" type="tableType"/>
+         <!-- QUESTION: Deprecate this? -->
+         <xs:element name="img" type="imageType"/>
+      </xs:choice>
+   </xs:group>
+   <xs:group name="blockTextGroup">
+      <xs:choice>
+         <xs:element name="pre" type="preformattedType"/>
+         <xs:element name="hr"/>
+         <!-- TODO: need to add support for blockquote, which can contain block elements. usnistgov/metaschema#70 -->
+         <xs:element name="blockquote" type="blockQuoteType"/>
+      </xs:choice>
+   </xs:group>
+   <xs:complexType name="preformattedType" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="inlineMarkupType">
+            <xs:annotation>
+               <xs:documentation>The content model is the same as inlineMarkupType, but line endings need
+            to be preserved, since this is preformatted.</xs:documentation>
+            </xs:annotation>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="listType">
+      <xs:sequence>
+         <xs:element name="li"
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:complexType name="orderedListType">
+      <xs:complexContent>
+         <xs:extension base="listType">
+		<!-- TODO: confirm if romans are allowed -->
+            <xs:attribute name="start" type="xs:nonNegativeInteger"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:group name="listsGroup">
+      <xs:choice>
+         <xs:element name="ul" type="listType"/>
+         <xs:element name="ol" type="orderedListType"/>
+      </xs:choice>
+   </xs:group>
+   <xs:complexType name="listItemType" mixed="true">
+    <!-- TODO: is this the correct construction? -->
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:group ref="inlineMarkupGroup"/>
+         <xs:group ref="listsGroup"/>
+         <xs:group ref="blockTextGroup"/>
+         <xs:group ref="headingBlockElementGroup"/>
+         <xs:element name="p" type="inlineMarkupType"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:complexType name="tableType">
+      <xs:sequence>
+         <xs:element maxOccurs="unbounded" name="tr" type="tableRowType"/>
+      </xs:sequence>
+   </xs:complexType>
+   <xs:complexType name="tableRowType">
+    <!-- QUESTION: Should we allow TH and TD to be mixed? -->
+      <xs:choice minOccurs="1" maxOccurs="unbounded">
+         <xs:element name="td" type="tableCellType" maxOccurs="unbounded"/>
+         <xs:element name="th" type="tableCellType" maxOccurs="unbounded"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:complexType name="tableCellType" mixed="true">
+      <xs:complexContent>
+      <!-- TODO: consider adding a choice between the inline or paragraphs. We need to figure out what is supported in Markdown. -->
+         <xs:extension base="inlineMarkupType">
+        <!-- TODO: need to add support for alignment. usnistgov/metaschema#70 -->
+            <xs:attribute name="align" type="alignType" default="left"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:simpleType name="alignType">
+      <xs:restriction base="xs:token">
+         <xs:enumeration value="left"/>
+         <xs:enumeration value="center"/>
+         <xs:enumeration value="right"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:complexType name="blockQuoteType">
+    <!-- TODO: confirm if nested blockquote is supported in markdown -->
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:group ref="blockElementGroup"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:complexType name="MarkupLineDatatype" mixed="true">
+      <xs:complexContent>
+         <xs:extension base="inlineMarkupType"/>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="inlineMarkupType" mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:group ref="inlineMarkupGroup"/>
+      </xs:choice>
+   </xs:complexType>
+   <xs:group name="inlineMarkupGroup">
+      <xs:choice>
+         <xs:element name="a" type="anchorType"/>
+         <xs:element name="insert" type="insertType"/>
+         <xs:element name="br"/>
+         <xs:group ref="phraseMarkupGroup"/>
+      </xs:choice>
+   </xs:group>
+   <xs:group name="phraseMarkupGroup">
+      <xs:choice>
+         <xs:element name="code" type="codeType"/>
+         <xs:element name="em" type="inlineMarkupType"/>
+         <xs:element name="i" type="inlineMarkupType"/>
+         <xs:element name="b" type="inlineMarkupType"/>
+         <xs:element name="strong" type="inlineMarkupType"/>
+         <xs:element name="sub" type="inlineMarkupType"/>
+         <xs:element name="sup" type="inlineMarkupType"/>
+         <xs:element name="q" type="inlineMarkupType"/>
+         <xs:element name="img" type="imageType"/>
+      </xs:choice>
+   </xs:group>
+   <xs:complexType name="codeType">
+      <xs:complexContent>
+         <xs:extension base="inlineMarkupType">
+            <xs:attribute name="class" type="xs:token"/>
+         </xs:extension>
+      </xs:complexContent>
+   </xs:complexType>
+   <xs:complexType name="imageType">
+      <xs:attribute name="alt" type="xs:string"/>
+      <xs:attribute name="src" use="required" type="xs:anyURI"/>
+      <xs:attribute name="title" type="xs:string"/>
+   </xs:complexType>
+   <xs:complexType name="anchorType" mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+         <xs:group ref="phraseMarkupGroup"/>
+      </xs:choice>
+      <xs:attribute name="href" type="xs:anyURI"/>
+      <xs:attribute name="title" type="xs:string"/>
+   </xs:complexType>
+   <xs:complexType name="insertType">
+      <xs:annotation>
+         <xs:documentation>An insert can be used to identify a placeholder for dynamically inserting text related to a specific object, which is referenced by the object's identifier using an <code xmlns="">id-ref</code>. This insert mechanism allows the selection of which text value from the object to dynamically include based on the application's display requirements.</xs:documentation>
+      </xs:annotation>
+      <xs:attribute name="type" use="required" type="xs:NCName">
+         <xs:annotation>
+            <xs:documentation>The type of object to include from (e.g., parameter, control, component, role, etc.)</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="id-ref" use="required" type="xs:NCName">
+         <xs:annotation>
+            <xs:documentation>The identity of the object to insert a value for. The identity will be selected from the index of objects of the specified <code xmlns="">type</code>. The specific value to include is based on the application's display requirements, which will likely use a specific data element associated with the <code xmlns="">type</code> (e.g., title, identifier, value, etc.) that is appropriate for the application.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:simpleType name="Base64Datatype">
+      <xs:annotation>
+         <xs:documentation>Binary data encoded using the Base64 encoding algorithm
+				as defined by RFC4648.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="xs:base64Binary">
+         <xs:pattern value="[0-9A-Za-z+/]+={0,2}"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="DateTimeDatatype">
+      <xs:annotation>
+         <xs:documentation>A string representing a point in time with an optional timezone.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="xs:dateTime">
+         <xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))?"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="DateTimeWithTimezoneDatatype">
+      <xs:annotation>
+         <xs:documentation>A string representing a point in time with a required timezone.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="DateTimeDatatype">
+         <xs:pattern value="(((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)|(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))|(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))|(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30)))T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|(-((0[0-9]|1[0-2]):00|0[39]:30)|\+((0[0-9]|1[0-4]):00|(0[34569]|10):30|(0[58]|12):45)))"/>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="EmailAddressDatatype">
+      <xs:annotation>
+         <xs:documentation>An email address string formatted according to RFC 6531.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="StringDatatype">
+         <xs:pattern value=".+@.+">
+				<!-- TODO: Need a better pattern. -->
+			</xs:pattern>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="StringDatatype">
+      <xs:annotation>
+         <xs:documentation>A non-empty string of Unicode characters with leading and trailing whitespace
+				disallowed. Whitespace is: U+9, U+10, U+32 or [ \n\t]+</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="xs:string">
+         <xs:annotation>
+            <xs:documentation>The 'string' datatype restricts the XSD type by prohibiting leading 
+					and trailing whitespace, and something (not only whitespace) is required.</xs:documentation>
+         </xs:annotation>
+         <xs:whiteSpace value="preserve"/>
+         <xs:pattern value="\S(.*\S)?">
+            <xs:annotation>
+               <xs:documentation>This pattern ensures that leading and trailing whitespace is
+						disallowed. This helps to even the user experience between implementations
+						related to whitespace.</xs:documentation>
+            </xs:annotation>
+         </xs:pattern>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="TokenDatatype">
+      <xs:annotation>
+			<!--<xs:documentation>Matching XSD NCName, except whitespace is not collapsed.</xs:documentation> -->
+         <xs:documentation>A non-empty, non-colonized name as defined by XML Schema Part 2: Datatypes
+				Second Edition (https://www.w3.org/TR/xmlschema11-2/#NCName), with leading and trailing
+				whitespace disallowed.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="StringDatatype">
+         <xs:pattern value="(\p{L}|_)(\p{L}|\p{N}|[.\-_])*">
+            <xs:annotation>
+					<!--<xs:documentation>An XML initial character (but not colon), followed 
+						by any XML name character (but not colon).</xs:documentation> -->
+               <xs:documentation>A single token may not contain whitespace.
+					</xs:documentation>
+            </xs:annotation>
+         </xs:pattern>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="URIDatatype">
+      <xs:annotation>
+         <xs:documentation>A universal resource identifier (URI) formatted according to RFC3986.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="xs:anyURI">
+         <xs:pattern value="[a-zA-Z][a-zA-Z0-9+\-.]+:.*\S">
+            <xs:annotation>
+               <xs:documentation>Requires a scheme with colon per RFC 3986.</xs:documentation>
+            </xs:annotation>
+         </xs:pattern>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="URIReferenceDatatype">
+      <xs:annotation>
+         <xs:documentation>A URI Reference, either a URI or a relative-reference, formatted according to section 4.1 of RFC3986.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="xs:anyURI">
+         <xs:pattern value="\S(.*\S)?">
+            <xs:annotation>
+               <xs:documentation>This pattern ensures that leading and trailing whitespace is
+						disallowed. This helps to even the user experience between implementations
+						related to whitespace.</xs:documentation>
+            </xs:annotation>
+         </xs:pattern>
+      </xs:restriction>
+   </xs:simpleType>
+   <xs:simpleType name="UUIDDatatype">
+      <xs:annotation>
+         <xs:documentation>A type 4 ('random' or 'pseudorandom') or type 5 UUID per RFC
+				4122.</xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="StringDatatype">
+         <xs:pattern value="[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[45][0-9A-Fa-f]{3}-[89ABab][0-9A-Fa-f]{3}-[0-9A-Fa-f]{12}">
+            <xs:annotation>
+               <xs:documentation>A sequence of 8-4-4-4-12 hex digits, with extra
+						constraints in the 13th and 17-18th places for version 4 and 5
+					</xs:documentation>
+            </xs:annotation>
+         </xs:pattern>
+      </xs:restriction>
+   </xs:simpleType>
+</xs:schema>
diff --git a/xml/schema/oscal_poam_schema.xsd b/xml/schema/oscal_poam_schema.xsd
index d6353a914b..7e6796f0af 100644
--- a/xml/schema/oscal_poam_schema.xsd
+++ b/xml/schema/oscal_poam_schema.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Plan of Action and Milestones (POA&amp;M) Model</m:schema-name>
@@ -19,7 +19,7 @@
       </xs:appinfo>
    </xs:annotation>
    <xs:element name="plan-of-action-and-milestones"
-               type="oscal-poam-plan-of-action-and-milestones-ASSEMBLY"/>
+                type="oscal-poam-plan-of-action-and-milestones-ASSEMBLY"/>
    <xs:complexType name="oscal-poam-plan-of-action-and-milestones-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -31,43 +31,47 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-ssp"
-                     type="oscal-assessment-common-import-ssp-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-import-ssp-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="system-id"
-                     type="oscal-implementation-common-system-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-system-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="local-definitions"
-                     type="oscal-poam-local-definitions-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-poam-local-definitions-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="observation"
-                     type="oscal-assessment-common-observation-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-observation-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk"
-                     type="oscal-assessment-common-risk-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-risk-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="finding"
+                      type="oscal-assessment-common-finding-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="poam-item"
-                     type="oscal-poam-poam-item-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-poam-poam-item-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>POA&amp;M Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#instance">instance</a>scope that can be used to reference this POA&amp;M instance in <a href="/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#instance">instance</a>scope that can be used to reference this POA&amp;M instance in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>POA&amp;M Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with instancescope that can be used to reference this POA&amp;M instance in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -85,21 +89,25 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="inventory-item"
-                     type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="assessment-assets"
+                      type="oscal-assessment-common-assessment-assets-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -148,13 +156,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -167,12 +175,34 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="actor"
-                              type="oscal-assessment-common-origin-actor-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-origin-actor-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
             </xs:complexType>
          </xs:element>
+         <xs:element name="related-finding" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Related Finding</m:formal-name>
+                     <m:description>Relates the poam-item to referenced finding(s).</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Related Finding</b>: Relates the poam-item to referenced finding(s).</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="finding-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Finding Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a finding defined in the list of findings.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Finding Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a finding defined in the list of findings.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
          <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -187,7 +217,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
@@ -209,7 +239,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
@@ -221,10 +251,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -235,7 +265,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>POA&amp;M Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#instance">instance</a> scope that can be used to reference this POA&amp;M item entry in <a href="/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#instance">instance</a> scope that can be used to reference this POA&amp;M item entry in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#poam-identifiers">this OSCAL instance</a>. This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>POA&amp;M Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with instance scope that can be used to reference this POA&amp;M item entry in this OSCAL instance. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -245,11 +275,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -268,473 +298,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -742,10 +776,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -753,10 +787,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -764,10 +798,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -779,10 +813,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -790,22 +824,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -824,13 +858,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -839,35 +873,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -877,14 +911,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -898,10 +932,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -912,10 +946,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -926,10 +960,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -940,20 +974,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -964,20 +998,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -1004,10 +1038,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1015,10 +1059,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -1050,21 +1094,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1072,32 +1126,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1108,10 +1162,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1119,32 +1250,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1155,10 +1286,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1177,10 +1308,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1190,10 +1321,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -1203,10 +1334,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1214,10 +1345,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1225,21 +1356,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -1247,10 +1378,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -1258,10 +1389,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1289,9 +1420,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -1310,10 +1441,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1323,10 +1454,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1371,10 +1502,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1382,10 +1513,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1447,13 +1578,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -1469,10 +1600,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1492,21 +1623,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1517,7 +1648,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1560,15 +1691,15 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="port-range"
-                     type="oscal-implementation-common-port-range-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-port-range-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Service Protocol Information Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Service Protocol Information Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1639,10 +1770,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1714,29 +1845,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="role-id"
-                     type="oscal-metadata-role-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-role-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="authorized-privilege"
-                     type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1747,7 +1878,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>User Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>User Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1795,9 +1926,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="function-performed"
-                     type="oscal-implementation-common-function-performed-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-function-performed-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="oscal-implementation-common-function-performed-FIELD">
@@ -1837,17 +1968,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-component" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -1860,25 +1991,25 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1889,7 +2020,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -1901,10 +2032,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1915,7 +2046,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Inventory Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Inventory Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1949,10 +2080,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1963,7 +2094,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Parameter ID</b>: A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.</xs:documentation>
@@ -1974,7 +2105,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Identification</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>System Identification</b>: A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.</xs:documentation>
@@ -1994,14 +2125,14 @@
          </xs:extension>
       </xs:simpleContent>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -2009,10 +2140,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -2020,61 +2151,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -2085,13 +2216,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -2112,10 +2243,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -2123,31 +2254,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2158,41 +2289,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -2226,10 +2358,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -2238,10 +2370,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2252,7 +2384,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -2265,7 +2397,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -2276,14 +2408,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -2313,7 +2445,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -2337,10 +2469,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2384,25 +2516,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2413,10 +2545,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2446,25 +2578,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2475,7 +2607,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Method Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment method elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>assessment method</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Method Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment method elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment method can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2523,13 +2655,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="step" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2572,29 +2704,29 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="reviewed-controls"
-                              type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="1"/>
+                               type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2605,7 +2737,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Step Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this step elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>step</code> (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Step Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this step elsewhere in this or other OSCAL instances. The locally defined UUID of the step (in a series of steps) can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2614,21 +2746,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="related-controls"
-                     type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-reviewed-controls-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2639,7 +2771,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Activity Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment activity elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>activity</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Activity Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment activity elsewhere in this or other OSCAL instances. The locally defined UUID of the activity can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2687,13 +2819,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="timing" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -2811,10 +2943,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2825,7 +2957,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -2834,9 +2966,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="associated-activity" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2849,29 +2981,29 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2882,7 +3014,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Activity Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an activity defined in the list of activities.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Activity Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an activity defined in the list of activities.</xs:documentation>
@@ -2891,21 +3023,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2916,7 +3048,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this task elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this task elsewhere in this or other OSCAL instances. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2959,13 +3091,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="control-selection" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -2993,35 +3125,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-control"
-                                 type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-control"
-                              type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-control-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3031,8 +3163,8 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="control-objective-selection"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
+                      minOccurs="0"
+                      maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
@@ -3059,35 +3191,35 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="include-all"
-                                 type="oscal-catalog-common-include-all-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-include-all-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="1"/>
                      <xs:element name="include-objective"
-                                 type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                                 minOccurs="1"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                                  minOccurs="1"
+                                  maxOccurs="unbounded"/>
                   </xs:choice>
                   <xs:element name="exclude-objective"
-                              type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-select-objective-by-id-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3100,10 +3232,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3139,10 +3271,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -3205,7 +3337,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Task Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined <em>UUID</em> of the <code>task</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <em>per-subject</em>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Task Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference (in this or other OSCAL instances) an assessment activity to be performed as part of the event. The locally defined UUID of the task can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3214,21 +3346,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3239,7 +3371,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined <em>UUID</em> of the <code>assessment subject placeholder</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Assessment Subject Placeholder Universally Unique Identifier</b>: A machine-oriented, globally unique identifier for a set of assessment subjects that will be identified by a task or an activity that is part of a task. The locally defined UUID of the assessment subject placeholder can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3272,35 +3404,35 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-subject"
-                        type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-subject"
-                     type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-select-subject-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3329,21 +3461,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3354,7 +3486,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -3375,7 +3507,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Identifies the Subject</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>Identifies the Subject</b>: A human-oriented identifier reference to a resource. Use type to indicate whether the identified resource is a component, inventory item, location, user, or something else.</xs:documentation>
@@ -3397,21 +3529,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3422,7 +3554,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Subject Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Subject Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component, inventory-item, location, party, user, or resource using it's UUID.</xs:documentation>
@@ -3450,9 +3582,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="assessment-platform" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3480,13 +3612,13 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="uses-component" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
@@ -3499,25 +3631,25 @@
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-party"
-                                       type="oscal-metadata-responsible-party-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-party-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3528,7 +3660,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a component that is implemented as part of an inventory item.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -3540,10 +3672,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3554,7 +3686,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Platform Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined <em>UUID</em> of the <code>assessment platform</code> can be used to reference the data item locally or globally (e.g., in an <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">imported OSCAL instance</a>). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Platform Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this assessment platform elsewhere in this or other OSCAL instances. The locally defined UUID of the assessment platform can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3605,13 +3737,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -3627,10 +3759,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3660,17 +3792,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="implementation-status"
-                     type="oscal-implementation-common-implementation-status-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-implementation-status-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3691,13 +3823,151 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Finding Target Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference for a specific target qualified by the <code>type</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Finding Target Identifier Reference</b>: A machine-oriented identifier reference for a specific target qualified by the type.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
+   <xs:complexType name="oscal-assessment-common-finding-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Finding</m:formal-name>
+            <m:description>Describes an individual finding.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Finding</b>: Describes an individual finding.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="title" minOccurs="1" maxOccurs="1">
+            <xs:complexType mixed="true">
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Title</m:formal-name>
+                     <m:description>The title for this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Title</b>: The title for this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupLineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="description" minOccurs="1" maxOccurs="1">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Finding Description</m:formal-name>
+                     <m:description>A human-readable description of this finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Finding Description</b>: A human-readable description of this finding.</xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                  <xs:extension base="MarkupMultilineDatatype"/>
+               </xs:complexContent>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="origin"
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="target"
+                      type="oscal-assessment-common-finding-target-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="implementation-statement-uuid" minOccurs="0" maxOccurs="1">
+            <xs:simpleType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Implementation Statement UUID</m:formal-name>
+                     <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the implementation statement in the SSP to which this finding is related.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Implementation Statement UUID</b>: A machine-oriented identifier reference to the implementation statement in the SSP to which this finding is related.</xs:documentation>
+               </xs:annotation>
+               <xs:restriction base="UUIDDatatype"/>
+            </xs:simpleType>
+         </xs:element>
+         <xs:element name="related-observation" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Related Observation</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced observations that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Related Observation</b>: Relates the finding to a set of referenced observations that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="observation-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="associated-risk" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Associated Risk</m:formal-name>
+                     <m:description>Relates the finding to a set of referenced risks that were used to determine the finding.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Associated Risk</b>: Relates the finding to a set of referenced risks that were used to determine the finding.</xs:documentation>
+               </xs:annotation>
+               <xs:attribute name="risk-uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Risk Universally Unique Identifier Reference</m:formal-name>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a risk defined in the list of risks.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Risk Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a risk defined in the list of risks.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Finding Universally Unique Identifier</m:formal-name>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this finding in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ar-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>finding</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Finding Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this finding in this or other OSCAL instances. The locally defined UUID of the finding can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
    <xs:complexType name="oscal-assessment-common-observation-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
@@ -3739,13 +4009,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="method" minOccurs="1" maxOccurs="unbounded">
             <xs:simpleType>
                <xs:annotation>
@@ -3773,13 +4043,13 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="relevant-evidence" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3807,21 +4077,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3870,10 +4140,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3884,7 +4154,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Observation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <em>cross-instance</em> scope that can be used to reference this observation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>observation</code> can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Observation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this observation elsewhere in this or other OSCAL instances. The locally defined UUID of the observation can be used to reference the data item locally or globally (e.g., in an imorted OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3902,13 +4172,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="actor"
-                     type="oscal-assessment-common-origin-actor-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-actor-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="related-task"
-                     type="oscal-assessment-common-related-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-related-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-assessment-common-origin-actor-ASSEMBLY">
@@ -3922,13 +4192,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="type" use="required" type="TokenDatatype">
          <xs:annotation>
@@ -3944,7 +4214,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Actor Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the tool or person based on the associated type.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Actor Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to the tool or person based on the associated type.</xs:documentation>
@@ -3972,21 +4242,21 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="subject"
-                     type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="identified-subject" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -3999,15 +4269,15 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-assessment-subject-ASSEMBLY"
-                              minOccurs="1"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-assessment-subject-ASSEMBLY"
+                               minOccurs="1"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="subject-placeholder-uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Assessment Subject Placeholder Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique assessment subject placeholder defined by this task.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Assessment Subject Placeholder Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique assessment subject placeholder defined by this task.</xs:documentation>
@@ -4019,10 +4289,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4033,7 +4303,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Task Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique task.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Task Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique task.</xs:documentation>
@@ -4130,29 +4400,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status"
-                     type="oscal-assessment-common-risk-status-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-risk-status-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="threat-id"
-                     type="oscal-assessment-common-threat-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-threat-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="characterization"
-                     type="oscal-assessment-common-characterization-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-characterization-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="mitigating-factor" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -4180,23 +4450,23 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Mitigating Factor Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this mitigating factor elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>mitigating factor</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Mitigating Factor Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this mitigating factor elsewhere in this or other OSCAL instances. The locally defined UUID of the mitigating factor can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4206,7 +4476,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Implementation UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this implementation statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>s. The locally defined <em>UUID</em> of the <code>implementation statement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Implementation UUID</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this implementation statement elsewhere in this or other OSCAL instancess. The locally defined UUID of the implementation statement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4228,9 +4498,9 @@
             </xs:simpleType>
          </xs:element>
          <xs:element name="response"
-                     type="oscal-assessment-common-response-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-response-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="risk-log" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -4310,21 +4580,21 @@
                               </xs:simpleType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="logged-by"
-                                       type="oscal-assessment-common-logged-by-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-assessment-common-logged-by-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="status-change"
-                                       type="oscal-assessment-common-risk-status-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
+                                        type="oscal-assessment-common-risk-status-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
                            <xs:element name="related-response" minOccurs="0" maxOccurs="unbounded">
                               <xs:complexType>
                                  <xs:annotation>
@@ -4337,25 +4607,25 @@
                                  </xs:annotation>
                                  <xs:sequence>
                                     <xs:element name="prop"
-                                                type="oscal-metadata-property-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-property-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="link"
-                                                type="oscal-metadata-link-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-metadata-link-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="related-task"
-                                                type="oscal-assessment-common-related-task-ASSEMBLY"
-                                                minOccurs="0"
-                                                maxOccurs="unbounded"/>
+                                                 type="oscal-assessment-common-related-task-ASSEMBLY"
+                                                 minOccurs="0"
+                                                 maxOccurs="unbounded"/>
                                     <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                                        <xs:annotation>
                                           <xs:appinfo>
                                              <m:formal-name>Remarks</m:formal-name>
-                                             <m:description>Additional commentary on the containing object.</m:description>
+                                             <m:description>Additional commentary about the containing object.</m:description>
                                           </xs:appinfo>
                                           <xs:documentation>
-                                             <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                             <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                                        </xs:annotation>
                                        <xs:complexType>
                                           <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4366,7 +4636,7 @@
                                     <xs:annotation>
                                        <xs:appinfo>
                                           <m:formal-name>Response Universally Unique Identifier Reference</m:formal-name>
-                                          <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
+                                          <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a unique risk response.</m:description>
                                        </xs:appinfo>
                                        <xs:documentation>
                                           <b>Response Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a unique risk response.</xs:documentation>
@@ -4378,10 +4648,10 @@
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4392,7 +4662,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Risk Log Entry Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk log entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk log entry</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Risk Log Entry Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk log entry elsewhere in this or other OSCAL instances. The locally defined UUID of the risk log entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4417,7 +4687,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Observation Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an observation defined in the list of observations.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Observation Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to an observation defined in the list of observations.</xs:documentation>
@@ -4430,7 +4700,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Risk Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this risk elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Risk Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this risk elsewhere in this or other OSCAL instances. The locally defined UUID of the risk can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4450,7 +4720,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Party UUID Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the party who is making the log entry.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Party UUID Reference</b>: A machine-oriented identifier reference to the party who is making the log entry.</xs:documentation>
@@ -4489,17 +4759,17 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="facet" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -4512,21 +4782,21 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4608,17 +4878,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="origin"
-                     type="oscal-assessment-common-origin-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-origin-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="required-asset" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -4631,9 +4901,9 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="subject"
-                              type="oscal-assessment-common-subject-reference-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-assessment-common-subject-reference-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
                      <xs:complexType mixed="true">
                         <xs:annotation>
@@ -4665,21 +4935,21 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4690,7 +4960,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Required Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this required asset elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>asset</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Required Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this required asset elsewhere in this or other OSCAL instances. The locally defined UUID of the asset can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4699,17 +4969,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="task"
-                     type="oscal-assessment-common-task-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-task-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -4720,7 +4990,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Remediation Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this remediation elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>risk response</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Remediation Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this remediation elsewhere in this or other OSCAL instances. The locally defined UUID of the risk response can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4763,24 +5033,24 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-assessment-common-assessment-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-assessment-common-assessment-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this part elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>part</code> can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Part Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this part elsewhere in this or other OSCAL instances. The locally defined UUID of the part can be used to reference the data item locally or globally (e.g., in an ported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -4864,9 +5134,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_profile_schema.xsd b/xml/schema/oscal_profile_schema.xsd
index 799ec71663..81c4809da3 100644
--- a/xml/schema/oscal_profile_schema.xsd
+++ b/xml/schema/oscal_profile_schema.xsd
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL Profile Model</m:schema-name>
          <m:schema-version>1.0.6</m:schema-version>
          <m:short-name>oscal-profile</m:short-name>
          <m:remarks>
-            <p>A profile designates a selection and configuration of controls from one or more catalogs, along with a series of operations over them. The topmost element in the OSCAL profile XML schema is <code>profile</code>.</p>
+            <p>In OSCAL a profile represents a set of selected <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#control">controls</a> from one or more control catalogs. Such a set of controls can be referenced by an OSCAL <a href="https://pages.nist.gov/OSCAL/concepts/layer/implementation/ssp/">system security plan</a> (SSP) to establish a control <a href="https://pages.nist.gov/OSCAL/concepts/terminology/#baseline">baseline</a>. This effective set of controls is produced from an OSCAL profile using a deterministic, predictable process called <a href="https://pages.nist.gov/OSCAL/concepts/processing/profile-resolution/">profile resolution</a>.</p>
+            <p>A profile references one or more OSCAL catalogs or profiles to import controls for control selection and tailoring. A profile can also describe how a resulting catalog is structured. When the profile is resolved, these selections and modifications are processed to produce a resulting OSCAL catalog.</p>
+            <p>OSCAL profiles have uses beyond establishing control baselines, such as documentation generation or as reference tables for validations.</p>
          </m:remarks>
          <m:root>profile</m:root>
       </xs:appinfo>
@@ -22,68 +24,68 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Profile</m:formal-name>
-            <m:description>Each OSCAL profile is defined by a Profile element</m:description>
+            <m:description>Each OSCAL profile is defined by a <code>profile</code> element.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Profile</b>: Each OSCAL profile is defined by a Profile element</xs:documentation>
+            <b>Profile</b>: Each OSCAL profile is defined by a profile element.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import"
-                     type="oscal-profile-import-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-profile-import-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="merge"
-                     type="oscal-profile-merge-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-profile-merge-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="modify"
-                     type="oscal-profile-modify-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-profile-modify-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Profile Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this profile elsewhere in <a href="/concepts/identifier-use/#profile-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>profile</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This identifier should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same profile across revisions of the document.</m:description>
+               <m:description>Provides a globally unique means to identify a given profile instance.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Profile Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this profile elsewhere in this or other OSCAL instances. The locally defined UUID of the profile can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This identifier should be assigned per-subject, which means it should be consistently used to identify the same profile across revisions of the document.</xs:documentation>
+               <b>Profile Universally Unique Identifier</b>: Provides a globally unique means to identify a given profile instance.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
    <xs:complexType name="oscal-profile-import-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Import resource</m:formal-name>
-            <m:description>The <code>import</code> designates a catalog or profile to be included (referenced and potentially modified) by this profile. The import also identifies which controls to select using the <code>include-all</code>, <code>include-controls</code>, and <code>exclude-controls</code> directives.</m:description>
+            <m:formal-name>Import Resource</m:formal-name>
+            <m:description>Designates a referenced source catalog or profile that provides a source of control information for use in creating a new overlay or baseline.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Import resource</b>: The import designates a catalog or profile to be included (referenced and potentially modified) by this profile. The import also identifies which controls to select using the include-all, include-controls, and exclude-controls directives.</xs:documentation>
+            <b>Import Resource</b>: Designates a referenced source catalog or profile that provides a source of control information for use in creating a new overlay or baseline.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-controls"
-                        type="oscal-profile-select-control-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-select-control-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-controls"
-                     type="oscal-profile-select-control-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-profile-select-control-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="href" use="required" type="URIReferenceDatatype">
          <xs:annotation>
@@ -99,31 +101,31 @@
    <xs:complexType name="oscal-profile-merge-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Merge controls</m:formal-name>
-            <m:description>A Merge element provides structuring directives that drive how controls are organized after resolution.</m:description>
+            <m:formal-name>Merge Controls</m:formal-name>
+            <m:description>Provides structuring directives that instruct how controls are organized after profile resolution.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Merge controls</b>: A Merge element provides structuring directives that drive how controls are organized after resolution.</xs:documentation>
+            <b>Merge Controls</b>: Provides structuring directives that instruct how controls are organized after profile resolution.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="combine" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Combination rule</m:formal-name>
-                     <m:description>A Combine element defines how to combine multiple (competing) versions of the same control.</m:description>
+                     <m:formal-name>Combination Rule</m:formal-name>
+                     <m:description>A Combine element defines how to resolve duplicate instances of the same control (e.g., controls with the same ID).</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Combination rule</b>: A Combine element defines how to combine multiple (competing) versions of the same control.</xs:documentation>
+                     <b>Combination Rule</b>: A Combine element defines how to resolve duplicate instances of the same control (e.g., controls with the same ID).</xs:documentation>
                </xs:annotation>
                <xs:attribute name="method" type="StringDatatype">
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Combination method</m:formal-name>
-                        <m:description>How clashing controls should be handled</m:description>
+                        <m:formal-name>Combination Method</m:formal-name>
+                        <m:description>Declare how clashing controls should be handled.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Combination method</b>: How clashing controls should be handled</xs:documentation>
+                        <b>Combination Method</b>: Declare how clashing controls should be handled.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -133,11 +135,11 @@
                <xs:complexType>
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Flat</m:formal-name>
-                        <m:description>Use the flat structuring method.</m:description>
+                        <m:formal-name>Flat Without Grouping</m:formal-name>
+                        <m:description>Directs that controls appear without any grouping structure.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Flat</b>: Use the flat structuring method.</xs:documentation>
+                        <b>Flat Without Grouping</b>: Directs that controls appear without any grouping structure.</xs:documentation>
                   </xs:annotation>
                </xs:complexType>
             </xs:element>
@@ -145,34 +147,34 @@
                <xs:simpleType>
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>As-Is Structuring Directive</m:formal-name>
-                        <m:description>An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.</m:description>
+                        <m:formal-name>Group As-Is</m:formal-name>
+                        <m:description>Indicates that the controls selected should retain their original grouping as defined in the import source.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>As-Is Structuring Directive</b>: An As-is element indicates that the controls should be structured in resolution as they are structured in their source catalogs. It does not contain any elements or attributes.</xs:documentation>
+                        <b>Group As-Is</b>: Indicates that the controls selected should retain their original grouping as defined in the import source.</xs:documentation>
                   </xs:annotation>
                   <xs:restriction base="BooleanDatatype"/>
                </xs:simpleType>
             </xs:element>
-            <xs:element name="custom" minOccurs="0" maxOccurs="1">
+            <xs:element name="custom" minOccurs="1" maxOccurs="1">
                <xs:complexType>
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Custom grouping</m:formal-name>
-                        <m:description>A Custom element frames a structure for embedding represented controls in resolution.</m:description>
+                        <m:formal-name>Custom Grouping</m:formal-name>
+                        <m:description>Provides an alternate grouping structure that selected controls will be placed in.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Custom grouping</b>: A Custom element frames a structure for embedding represented controls in resolution.</xs:documentation>
+                        <b>Custom Grouping</b>: Provides an alternate grouping structure that selected controls will be placed in.</xs:documentation>
                   </xs:annotation>
                   <xs:sequence>
                      <xs:element name="group"
-                                 type="oscal-profile-group-ASSEMBLY"
-                                 minOccurs="0"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-profile-group-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
                      <xs:element name="insert-controls"
-                                 type="oscal-profile-insert-controls-ASSEMBLY"
-                                 minOccurs="0"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-profile-insert-controls-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
                   </xs:sequence>
                </xs:complexType>
             </xs:element>
@@ -182,11 +184,11 @@
    <xs:complexType name="oscal-profile-group-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Control group</m:formal-name>
-            <m:description>A group of (selected) controls or of groups of controls</m:description>
+            <m:formal-name>Control Group</m:formal-name>
+            <m:description>A group of (selected) controls or of groups of controls.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Control group</b>: A group of (selected) controls or of groups of controls</xs:documentation>
+            <b>Control Group</b>: A group of (selected) controls or of groups of controls.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -194,10 +196,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Group Title</m:formal-name>
-                     <m:description>A name given to the group, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>A name to be given to the group for use in display.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Group Title</b>: A name given to the group, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Group Title</b>: A name to be given to the group for use in display.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -205,40 +207,40 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="group"
-                        type="oscal-profile-group-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-group-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="insert-controls"
-                        type="oscal-profile-insert-controls-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-insert-controls-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
          </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Group Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined group elsewhere in <a href="/concepts/identifier-use/#profile-identifiers">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same group across revisions of the document.</m:description>
+               <m:description>Identifies the group.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Group Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined group elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same group across revisions of the document.</xs:documentation>
+               <b>Group Identifier</b>: Identifies the group.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
@@ -255,11 +257,11 @@
    <xs:complexType name="oscal-profile-modify-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Modify controls</m:formal-name>
-            <m:description>Set parameters or amend controls in resolution</m:description>
+            <m:formal-name>Modify Controls</m:formal-name>
+            <m:description>Set parameters or amend controls in resolution.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Modify controls</b>: Set parameters or amend controls in resolution</xs:documentation>
+            <b>Modify Controls</b>: Set parameters or amend controls in resolution.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="set-parameter" minOccurs="0" maxOccurs="unbounded">
@@ -267,20 +269,20 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Setting</m:formal-name>
-                     <m:description>A parameter setting, to be propagated to points of insertion</m:description>
+                     <m:description>A parameter setting, to be propagated to points of insertion.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Setting</b>: A parameter setting, to be propagated to points of insertion</xs:documentation>
+                     <b>Parameter Setting</b>: A parameter setting, to be propagated to points of insertion.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="label" minOccurs="0" maxOccurs="1">
                      <xs:complexType mixed="true">
                         <xs:annotation>
@@ -301,10 +303,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Parameter Usage Description</m:formal-name>
-                              <m:description>Describes the purpose and use of a parameter</m:description>
+                              <m:description>Describes the purpose and use of a parameter.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                              <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -312,32 +314,32 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="constraint"
-                              type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="guideline"
-                              type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:choice>
                      <xs:element name="value"
-                                 type="oscal-catalog-common-parameter-value-FIELD"
-                                 minOccurs="0"
-                                 maxOccurs="unbounded"/>
+                                  type="oscal-control-common-parameter-value-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
                      <xs:element name="select"
-                                 type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                                 minOccurs="0"
-                                 maxOccurs="1"/>
+                                  type="oscal-control-common-parameter-selection-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="1"/>
                   </xs:choice>
                </xs:sequence>
                <xs:attribute name="param-id" use="required" type="TokenDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Parameter ID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#profile-identifiers">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>An identifier for the parameter.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Parameter ID</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Parameter ID</b>: An identifier for the parameter.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
                <xs:attribute name="class" type="TokenDatatype">
@@ -353,45 +355,192 @@
                <xs:attribute name="depends-on" type="TokenDatatype">
                   <xs:annotation>
                      <xs:appinfo>
-                        <m:formal-name>Depends on</m:formal-name>
+                        <m:formal-name>Depends On</m:formal-name>
                         <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+                        <b>Depends On</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
+         </xs:element>
+         <xs:element name="alter" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
+               <xs:annotation>
+                  <xs:appinfo>
+                     <m:formal-name>Alteration</m:formal-name>
+                     <m:description>Specifies changes to be made to an included control when a profile is resolved.</m:description>
+                  </xs:appinfo>
+                  <xs:documentation>
+                     <b>Alteration</b>: Specifies changes to be made to an included control when a profile is resolved.</xs:documentation>
+               </xs:annotation>
+               <xs:sequence>
+                  <xs:element name="remove" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Removal</m:formal-name>
+                              <m:description>Specifies objects to be removed from a control based on specific aspects of the object that must all match.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Removal</b>: Specifies objects to be removed from a control based on specific aspects of the object that must all match.</xs:documentation>
+                        </xs:annotation>
+                        <xs:attribute name="by-name" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by (assigned) name</m:formal-name>
+                                 <m:description>Identify items remove by matching their assigned name.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by (assigned) name</b>: Identify items remove by matching their assigned name.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-class" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by class</m:formal-name>
+                                 <m:description>Identify items to remove by matching their <code>class</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by class</b>: Identify items to remove by matching their class.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-id" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by ID</m:formal-name>
+                                 <m:description>Identify items to remove indicated by their <code>id</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by ID</b>: Identify items to remove indicated by their id.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-item-name" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Item Name Reference</m:formal-name>
+                                 <m:description>Identify items to remove by the name of the item's information object name, e.g. <code>title</code> or <code>prop</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Item Name Reference</b>: Identify items to remove by the name of the item's information object name, e.g. title or prop.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-ns" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Item Namespace Reference</m:formal-name>
+                                 <m:description>Identify items to remove by the item's <code>ns</code>, which is the namespace associated with a <code>part</code>, or <code>prop</code>.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Item Namespace Reference</b>: Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="add" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Addition</m:formal-name>
+                              <m:description>Specifies contents to be added into controls, in resolution.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Addition</b>: Specifies contents to be added into controls, in resolution.</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Title Change</m:formal-name>
+                                       <m:description>A name given to the control, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Title Change</b>: A name given to the control, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="param"
+                                        type="oscal-control-common-parameter-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="part"
+                                        type="oscal-control-common-part-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                        </xs:sequence>
+                        <xs:attribute name="position" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Position</m:formal-name>
+                                 <m:description>Where to add the new content with respect to the targeted element (beside it or inside it).</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Position</b>: Where to add the new content with respect to the targeted element (beside it or inside it).</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                        <xs:attribute name="by-id" type="TokenDatatype">
+                           <xs:annotation>
+                              <xs:appinfo>
+                                 <m:formal-name>Reference by ID</m:formal-name>
+                                 <m:description>Target location of the addition.</m:description>
+                              </xs:appinfo>
+                              <xs:documentation>
+                                 <b>Reference by ID</b>: Target location of the addition.</xs:documentation>
+                           </xs:annotation>
+                        </xs:attribute>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="control-id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Control Identifier Reference</m:formal-name>
+                        <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="alter"
-                     type="oscal-profile-alter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-profile-insert-controls-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Select controls</m:formal-name>
+            <m:formal-name>Insert Controls</m:formal-name>
             <m:description>Specifies which controls to use in the containing context.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Select controls</b>: Specifies which controls to use in the containing context.</xs:documentation>
+            <b>Insert Controls</b>: Specifies which controls to use in the containing context.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:choice>
             <xs:element name="include-all"
-                        type="oscal-catalog-common-include-all-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-include-all-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="1"/>
             <xs:element name="include-controls"
-                        type="oscal-profile-select-control-by-id-ASSEMBLY"
-                        minOccurs="1"
-                        maxOccurs="unbounded"/>
+                         type="oscal-profile-select-control-by-id-ASSEMBLY"
+                         minOccurs="1"
+                         maxOccurs="unbounded"/>
          </xs:choice>
          <xs:element name="exclude-controls"
-                     type="oscal-profile-select-control-by-id-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-profile-select-control-by-id-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="order" type="TokenDatatype">
          <xs:annotation>
@@ -407,222 +556,72 @@
    <xs:complexType name="oscal-profile-select-control-by-id-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Call</m:formal-name>
-            <m:description>Call a control by its ID</m:description>
+            <m:formal-name>Select Control</m:formal-name>
+            <m:description>Select a control or controls from an imported control set.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Call</b>: Call a control by its ID</xs:documentation>
+            <b>Select Control</b>: Select a control or controls from an imported control set.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
-         <xs:element name="with-id" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Match Controls by Identifier</m:formal-name>
-                     <m:description/>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Match Controls by Identifier</b>: </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="TokenDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="matching" minOccurs="0" maxOccurs="unbounded">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Match Controls by Pattern</m:formal-name>
-                     <m:description>Select controls by (regular expression) match on ID</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Match Controls by Pattern</b>: Select controls by (regular expression) match on ID</xs:documentation>
-               </xs:annotation>
-               <xs:attribute name="pattern" type="StringDatatype">
-                  <xs:annotation>
-                     <xs:appinfo>
-                        <m:formal-name>Pattern</m:formal-name>
-                        <m:description>A <a href="https://en.wikipedia.org/wiki/Glob_(programming)">glob expression</a> matching the IDs of one or more controls to be selected.</m:description>
-                     </xs:appinfo>
-                     <xs:documentation>
-                        <b>Pattern</b>: A glob expression matching the IDs of one or more controls to be selected.</xs:documentation>
-                  </xs:annotation>
-               </xs:attribute>
-            </xs:complexType>
-         </xs:element>
+         <xs:element name="with-id"
+                      type="oscal-profile-with-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="matching"
+                      type="oscal-profile-matching-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="with-child-controls" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Include contained controls with control</m:formal-name>
+               <m:formal-name>Include Contained Controls with Control</m:formal-name>
                <m:description>When a control is included, whether its child (dependent) controls are also included.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Include contained controls with control</b>: When a control is included, whether its child (dependent) controls are also included.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:complexType name="oscal-profile-alter-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Alteration</m:formal-name>
-            <m:description>An Alter element specifies changes to be made to an included control when a profile is resolved.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Alteration</b>: An Alter element specifies changes to be made to an included control when a profile is resolved.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="remove"
-                     type="oscal-profile-remove-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="add"
-                     type="oscal-profile-add-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="control-id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Include Contained Controls with Control</b>: When a control is included, whether its child (dependent) controls are also included.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-profile-remove-ASSEMBLY">
+   <xs:simpleType name="oscal-profile-with-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Removal</m:formal-name>
-            <m:description>Specifies objects to be removed from a control based on specific aspects of the object that must all match.</m:description>
+            <m:formal-name>Match Controls by Identifier</m:formal-name>
+            <m:description>Selecting a control by its ID given as a literal.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Removal</b>: Specifies objects to be removed from a control based on specific aspects of the object that must all match.</xs:documentation>
+            <b>Match Controls by Identifier</b>: Selecting a control by its ID given as a literal.</xs:documentation>
       </xs:annotation>
-      <xs:attribute name="by-name" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Reference by (assigned) name</m:formal-name>
-               <m:description>Identify items to remove by matching their assigned name</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Reference by (assigned) name</b>: Identify items to remove by matching their assigned name</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-class" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Reference by class</m:formal-name>
-               <m:description>Identify items to remove by matching their <code>class</code>.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Reference by class</b>: Identify items to remove by matching their class.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-id" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Reference by ID</m:formal-name>
-               <m:description>Identify items to remove indicated by their <code>id</code>.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Reference by ID</b>: Identify items to remove indicated by their id.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-item-name" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Item Name Reference</m:formal-name>
-               <m:description>Identify items to remove by the name of the item's information element name, e.g. <code>title</code> or <code>prop</code>
-               </m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Item Name Reference</b>: Identify items to remove by the name of the item's information element name, e.g. title or prop</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-ns" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Item Namespace Reference</m:formal-name>
-               <m:description>Identify items to remove by the item's <code>ns</code>, which is the namespace associated with a <code>part</code>, or <code>prop</code>.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Item Namespace Reference</b>: Identify items to remove by the item's ns, which is the namespace associated with a part, or prop.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:complexType name="oscal-profile-add-ASSEMBLY">
+      <xs:restriction base="TokenDatatype"/>
+   </xs:simpleType>
+   <xs:complexType name="oscal-profile-matching-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Addition</m:formal-name>
-            <m:description>Specifies contents to be added into controls, in resolution</m:description>
+            <m:formal-name>Match Controls by Pattern</m:formal-name>
+            <m:description>Selecting a set of controls by matching their IDs with a wildcard pattern.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Addition</b>: Specifies contents to be added into controls, in resolution</xs:documentation>
+            <b>Match Controls by Pattern</b>: Selecting a set of controls by matching their IDs with a wildcard pattern.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Title Change</m:formal-name>
-                     <m:description>A name given to the control, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Title Change</b>: A name given to the control, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="param"
-                     type="oscal-catalog-common-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-      </xs:sequence>
-      <xs:attribute name="position" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Position</m:formal-name>
-               <m:description>Where to add the new content with respect to the targeted element (beside it or inside it)</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Position</b>: Where to add the new content with respect to the targeted element (beside it or inside it)</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="by-id" type="TokenDatatype">
+      <xs:attribute name="pattern" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Reference by ID</m:formal-name>
-               <m:description>Target location of the addition.</m:description>
+               <m:formal-name>Pattern</m:formal-name>
+               <m:description>A <a href="https://en.wikipedia.org/wiki/Glob_(programming)">glob expression</a> matching the IDs of one or more controls to be selected.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Reference by ID</b>: Target location of the addition.</xs:documentation>
+               <b>Pattern</b>: A glob expression matching the IDs of one or more controls to be selected.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -641,473 +640,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -1115,10 +1118,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -1126,10 +1129,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -1137,10 +1140,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -1152,10 +1155,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -1163,22 +1166,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -1197,13 +1200,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -1212,35 +1215,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -1250,14 +1253,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -1271,10 +1274,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -1285,10 +1288,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1299,10 +1302,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -1313,20 +1316,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1337,20 +1340,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -1377,10 +1380,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1388,10 +1401,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -1423,21 +1436,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1445,32 +1468,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1481,10 +1504,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1492,32 +1592,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1528,10 +1628,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1550,10 +1650,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -1563,10 +1663,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -1576,10 +1676,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1587,10 +1687,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -1598,21 +1698,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -1620,10 +1720,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -1631,10 +1731,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1662,9 +1762,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -1683,10 +1783,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1696,10 +1796,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -1744,10 +1844,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -1755,23 +1855,23 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
       </xs:simpleContent>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -1779,10 +1879,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -1790,61 +1890,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -1855,13 +1955,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -1882,10 +1982,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -1893,31 +1993,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1928,41 +2028,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -1996,10 +2097,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -2008,10 +2109,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2022,7 +2123,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -2035,7 +2136,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -2046,14 +2147,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -2083,7 +2184,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -2140,9 +2241,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">
diff --git a/xml/schema/oscal_ssp_schema.xsd b/xml/schema/oscal_ssp_schema.xsd
index f3e72007d7..d3d6d0700b 100644
--- a/xml/schema/oscal_ssp_schema.xsd
+++ b/xml/schema/oscal_ssp_schema.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns="http://csrc.nist.gov/ns/oscal/1.0"
-           xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
-           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           elementFormDefault="qualified"
-           targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
-           version="1.0.6">
+            xmlns:m="http://csrc.nist.gov/ns/oscal/metaschema/1.0"
+            xmlns:xs="http://www.w3.org/2001/XMLSchema"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            elementFormDefault="qualified"
+            targetNamespace="http://csrc.nist.gov/ns/oscal/1.0"
+            version="1.0.6">
    <xs:annotation>
       <xs:appinfo>
          <m:schema-name>OSCAL System Security Plan (SSP) Model</m:schema-name>
@@ -19,47 +19,47 @@
       </xs:appinfo>
    </xs:annotation>
    <xs:element name="system-security-plan"
-               type="oscal-ssp-system-security-plan-ASSEMBLY"/>
+                type="oscal-ssp-system-security-plan-ASSEMBLY"/>
    <xs:complexType name="oscal-ssp-system-security-plan-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Security Plan (SSP)</m:formal-name>
-            <m:description>A system security plan, such as those described in NIST SP 800-18</m:description>
+            <m:description>A system security plan, such as those described in NIST SP 800-18.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>System Security Plan (SSP)</b>: A system security plan, such as those described in NIST SP 800-18</xs:documentation>
+            <b>System Security Plan (SSP)</b>: A system security plan, such as those described in NIST SP 800-18.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="metadata"
-                     type="oscal-metadata-metadata-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-metadata-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="import-profile"
-                     type="oscal-ssp-import-profile-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-import-profile-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="system-characteristics"
-                     type="oscal-ssp-system-characteristics-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-system-characteristics-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="system-implementation"
-                     type="oscal-ssp-system-implementation-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-system-implementation-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="control-implementation"
-                     type="oscal-ssp-control-implementation-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-control-implementation-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="back-matter"
-                     type="oscal-metadata-back-matter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-back-matter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
       </xs:sequence>
       <xs:attribute name="uuid" use="required" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>System Security Plan Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system security plan (SSP) elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>SSP</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system security plan (SSP) elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>SSP</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>System Security Plan Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this system security plan (SSP) elsewhere in this or other OSCAL instances. The locally defined UUID of the SSP can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance).This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -80,10 +80,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -112,9 +112,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="system-id"
-                     type="oscal-implementation-common-system-id-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-id-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="system-name" minOccurs="1" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -157,66 +157,66 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="date-authorized"
-                     type="oscal-ssp-date-authorized-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-date-authorized-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="security-sensitivity-level" minOccurs="1" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Security Sensitivity Level</m:formal-name>
-                     <m:description>The overall information system sensitivity categorization, such as defined by <a href="https://doi.org/10.6028/NIST.FIPS.199">FIPS-199</a>. </m:description>
+                     <m:description>The overall information system sensitivity categorization, such as defined by <a href="https://doi.org/10.6028/NIST.FIPS.199">FIPS-199</a>.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Security Sensitivity Level</b>: The overall information system sensitivity categorization, such as defined by FIPS-199. </xs:documentation>
+                     <b>Security Sensitivity Level</b>: The overall information system sensitivity categorization, such as defined by FIPS-199.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
          </xs:element>
          <xs:element name="system-information"
-                     type="oscal-ssp-system-information-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-system-information-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="security-impact-level"
-                     type="oscal-ssp-security-impact-level-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-security-impact-level-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="status"
-                     type="oscal-ssp-status-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-status-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="authorization-boundary"
-                     type="oscal-ssp-authorization-boundary-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-authorization-boundary-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="network-architecture"
-                     type="oscal-ssp-network-architecture-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-network-architecture-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="data-flow"
-                     type="oscal-ssp-data-flow-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-ssp-data-flow-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -228,29 +228,29 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Information</m:formal-name>
-            <m:description>Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>. </m:description>
+            <m:description>Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>System Information</b>: Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60. </xs:documentation>
+            <b>System Information</b>: Contains details about all information types that are stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="information-type" minOccurs="1" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Information Type</m:formal-name>
-                     <m:description>Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>. </m:description>
+                     <m:description>Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in <a href="https://doi.org/10.6028/NIST.SP.800-60v2r1">NIST SP 800-60</a>.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Information Type</b>: Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60. </xs:documentation>
+                     <b>Information Type</b>: Contains details about one information type that is stored, processed, or transmitted by the system, such as privacy information, and those defined in NIST SP 800-60.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -299,7 +299,7 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Information Type Systematized Identifier</m:formal-name>
-                                       <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier qualified by the given identification <code>system</code> used, such as NIST SP 800-60. This identifier has <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this system elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                       <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier qualified by the given identification <code>system</code> used, such as NIST SP 800-60. This identifier has <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this system elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. This id should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
                                        <b>Information Type Systematized Identifier</b>: A human-oriented, globally unique identifier qualified by the given identification system used, such as NIST SP 800-60. This identifier has cross-instance scope and can be used to reference this system elsewhere in this or other OSCAL instances. This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -321,148 +321,31 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-                  <xs:element name="confidentiality-impact" minOccurs="1" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Confidentiality Impact Level</m:formal-name>
-                              <m:description>The expected level of impact resulting from the unauthorized disclosure of the described information.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Confidentiality Impact Level</b>: The expected level of impact resulting from the unauthorized disclosure of the described information.</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="base"
-                                       type="oscal-ssp-base-FIELD"
-                                       minOccurs="1"
-                                       maxOccurs="1"/>
-                           <xs:element name="selected"
-                                       type="oscal-ssp-selected-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
-                           <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
-                              <xs:annotation>
-                                 <xs:appinfo>
-                                    <m:formal-name>Adjustment Justification</m:formal-name>
-                                    <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
-                                 </xs:appinfo>
-                                 <xs:documentation>
-                                    <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
-                  <xs:element name="integrity-impact" minOccurs="1" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Integrity Impact Level</m:formal-name>
-                              <m:description>The expected level of impact resulting from the unauthorized modification of the described information.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Integrity Impact Level</b>: The expected level of impact resulting from the unauthorized modification of the described information.</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="base"
-                                       type="oscal-ssp-base-FIELD"
-                                       minOccurs="1"
-                                       maxOccurs="1"/>
-                           <xs:element name="selected"
-                                       type="oscal-ssp-selected-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
-                           <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
-                              <xs:annotation>
-                                 <xs:appinfo>
-                                    <m:formal-name>Adjustment Justification</m:formal-name>
-                                    <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
-                                 </xs:appinfo>
-                                 <xs:documentation>
-                                    <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
-                  <xs:element name="availability-impact" minOccurs="1" maxOccurs="1">
-                     <xs:complexType>
-                        <xs:annotation>
-                           <xs:appinfo>
-                              <m:formal-name>Availability Impact Level</m:formal-name>
-                              <m:description>The expected level of impact resulting from the disruption of access to or use of the described information or the information system.</m:description>
-                           </xs:appinfo>
-                           <xs:documentation>
-                              <b>Availability Impact Level</b>: The expected level of impact resulting from the disruption of access to or use of the described information or the information system.</xs:documentation>
-                        </xs:annotation>
-                        <xs:sequence>
-                           <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
-                           <xs:element name="base"
-                                       type="oscal-ssp-base-FIELD"
-                                       minOccurs="1"
-                                       maxOccurs="1"/>
-                           <xs:element name="selected"
-                                       type="oscal-ssp-selected-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="1"/>
-                           <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
-                              <xs:annotation>
-                                 <xs:appinfo>
-                                    <m:formal-name>Adjustment Justification</m:formal-name>
-                                    <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
-                                 </xs:appinfo>
-                                 <xs:documentation>
-                                    <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
-                              </xs:annotation>
-                              <xs:complexType>
-                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-                              </xs:complexType>
-                           </xs:element>
-                        </xs:sequence>
-                     </xs:complexType>
-                  </xs:element>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="confidentiality-impact"
+                               type="oscal-ssp-impact-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="integrity-impact"
+                               type="oscal-ssp-impact-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="availability-impact"
+                               type="oscal-ssp-impact-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
                </xs:sequence>
                <xs:attribute name="uuid" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Information Type Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this information type elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>information type</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this information type elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>information type</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Information Type Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this information type elsewhere in this or other OSCAL instances. The locally defined UUID of the information type can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -472,6 +355,47 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
+   <xs:complexType name="oscal-ssp-impact-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Impact Level</m:formal-name>
+            <m:description>The expected level of impact resulting from the described information.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Impact Level</b>: The expected level of impact resulting from the described information.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="base"
+                      type="oscal-ssp-base-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
+         <xs:element name="selected"
+                      type="oscal-ssp-selected-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
+         <xs:element name="adjustment-justification" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Adjustment Justification</m:formal-name>
+                  <m:description>If the selected security level is different from the base security level, this contains the justification for the change.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Adjustment Justification</b>: If the selected security level is different from the base security level, this contains the justification for the change.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+   </xs:complexType>
    <xs:simpleType name="oscal-ssp-base-FIELD">
       <xs:annotation>
          <xs:appinfo>
@@ -518,8 +442,8 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="security-objective-confidentiality"
-                     minOccurs="1"
-                     maxOccurs="1">
+                      minOccurs="1"
+                      maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
                   <xs:appinfo>
@@ -574,10 +498,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -632,25 +556,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="diagram"
-                     type="oscal-ssp-diagram-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-diagram-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -684,13 +608,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="caption" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -710,10 +634,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -724,7 +648,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Diagram ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this diagram elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>diagram</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this diagram elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>diagram</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Diagram ID</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this diagram elsewhere in this or other OSCAL instances. The locally defined UUID of the diagram can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -757,25 +681,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="diagram"
-                     type="oscal-ssp-diagram-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-diagram-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -809,25 +733,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="diagram"
-                     type="oscal-ssp-diagram-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-diagram-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -846,22 +770,22 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="leveraged-authorization" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Leveraged Authorization</m:formal-name>
-                     <m:description>A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a <em>common control provider</em>. </m:description>
+                     <m:description>A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a <em>common control provider</em>.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Leveraged Authorization</b>: A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider. </xs:documentation>
+                     <b>Leveraged Authorization</b>: A description of another authorized system from which this system inherits capabilities that satisfy security requirements. Another term for this concept is a common control provider.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -880,19 +804,19 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="party-uuid" minOccurs="1" maxOccurs="1">
                      <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>party-uuid field</m:formal-name>
-                              <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>party</code> that manages the leveraged system.</m:description>
+                              <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>party</code> that manages the leveraged system.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
                               <b>party-uuid field</b>: A machine-oriented identifier reference to the party that manages the leveraged system.</xs:documentation>
@@ -901,17 +825,17 @@
                      </xs:simpleType>
                   </xs:element>
                   <xs:element name="date-authorized"
-                              type="oscal-ssp-date-authorized-FIELD"
-                              minOccurs="1"
-                              maxOccurs="1"/>
+                               type="oscal-ssp-date-authorized-FIELD"
+                               minOccurs="1"
+                               maxOccurs="1"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -922,7 +846,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Leveraged Authorization Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this leveraged authorization elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>leveraged authorization</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope and can be used to reference this leveraged authorization elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>leveraged authorization</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Leveraged Authorization Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope and can be used to reference this leveraged authorization elsewhere in this or other OSCAL instances. The locally defined UUID of the leveraged authorization can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -931,25 +855,25 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="user"
-                     type="oscal-implementation-common-system-user-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-user-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="component"
-                     type="oscal-implementation-common-system-component-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-system-component-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="inventory-item"
-                     type="oscal-implementation-common-inventory-item-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-inventory-item-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -983,13 +907,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-requirement"
-                     type="oscal-ssp-implemented-requirement-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-implemented-requirement-ASSEMBLY"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="oscal-ssp-implemented-requirement-ASSEMBLY">
@@ -1003,37 +927,37 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="statement"
-                     type="oscal-ssp-statement-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-statement-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="by-component"
-                     type="oscal-ssp-by-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-by-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1044,7 +968,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Requirement Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control requirement elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control requirement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control requirement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control requirement</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Requirement Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control requirement elsewhere in this or other OSCAL instances. The locally defined UUID of the control requirement can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1054,10 +978,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
+               <m:description>A reference to a control with a corresponding <code>id</code> value. When referencing an externally defined <code>control</code>, the <code>Control Identifier Reference</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Control Identifier Reference</b>: A human-oriented identifier reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
+               <b>Control Identifier Reference</b>: A reference to a control with a corresponding id value. When referencing an externally defined control, the Control Identifier Reference must be used in the context of the external / imported OSCAL instance (e.g., uri-reference).</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -1072,29 +996,29 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="by-component"
-                     type="oscal-ssp-by-component-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-ssp-by-component-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1105,7 +1029,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>control statement</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference</b>: A human-oriented identifier reference to a control statement.</xs:documentation>
@@ -1115,7 +1039,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Control Statement Reference Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this control statement elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The <em>UUID</em> of the <code>control statement</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Control Statement Reference Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this control statement elsewhere in this or other OSCAL instances. The UUID of the control statement in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance).</xs:documentation>
@@ -1148,21 +1072,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="set-parameter"
-                     type="oscal-implementation-common-set-parameter-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-set-parameter-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implementation-status"
-                     type="oscal-implementation-common-implementation-status-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-implementation-common-implementation-status-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="export" minOccurs="0" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -1190,13 +1114,13 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="provided" minOccurs="0" maxOccurs="unbounded">
                      <xs:complexType>
                         <xs:annotation>
@@ -1224,25 +1148,25 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-role"
-                                       type="oscal-metadata-responsible-role-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-role-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1253,7 +1177,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Provided Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this provided entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>provided</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this provided entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>provided</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Provided Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this provided entry elsewhere in this or other OSCAL instances. The locally defined UUID of the provided entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1288,25 +1212,25 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="responsible-role"
-                                       type="oscal-metadata-responsible-role-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-responsible-role-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                               <xs:annotation>
                                  <xs:appinfo>
                                     <m:formal-name>Remarks</m:formal-name>
-                                    <m:description>Additional commentary on the containing object.</m:description>
+                                    <m:description>Additional commentary about the containing object.</m:description>
                                  </xs:appinfo>
                                  <xs:documentation>
-                                    <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                               </xs:annotation>
                               <xs:complexType>
                                  <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1317,7 +1241,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Responsibility Universally Unique Identifier</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this responsibility elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>responsibility</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this responsibility elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>responsibility</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Responsibility Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this responsibility elsewhere in this or other OSCAL instances. The locally defined UUID of the responsibility can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1327,7 +1251,7 @@
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Provided UUID</m:formal-name>
-                                 <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
+                                 <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
                                  <b>Provided UUID</b>: A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</xs:documentation>
@@ -1339,10 +1263,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1378,23 +1302,23 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                </xs:sequence>
                <xs:attribute name="uuid" use="required" type="UUIDDatatype">
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Inherited Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inherited entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inherited control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inherited entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inherited control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Inherited Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inherited entry elsewhere in this or other OSCAL instances. The locally defined UUID of the inherited control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1404,7 +1328,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Provided UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Provided UUID</b>: A machine-oriented identifier reference to an inherited control implementation that a leveraging system is inheriting from a leveraged system.</xs:documentation>
@@ -1439,25 +1363,25 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-role"
-                              type="oscal-metadata-responsible-role-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-role-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1468,7 +1392,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Satisfied Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this satisfied control implementation entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this satisfied control implementation entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>control implementation</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Satisfied Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this satisfied control implementation entry elsewhere in this or other OSCAL instances. The locally defined UUID of the control implementation can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1478,7 +1402,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Responsibility UUID</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Responsibility UUID</b>: A machine-oriented identifier reference to a control implementation that satisfies a responsibility imposed by a leveraged system.</xs:documentation>
@@ -1487,17 +1411,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -1508,7 +1432,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>component</code> that is implemeting a given control.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to the <code>component</code> that is implemeting a given control.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to the component that is implemeting a given control.</xs:documentation>
@@ -1518,7 +1442,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>By-Component Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this by-component entry elsewhere in <a href="/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>by-component</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this by-component entry elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#ssp-identifiers">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>by-component</code> entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>By-Component Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this by-component entry elsewhere in this or other OSCAL instances. The locally defined UUID of the by-component entry can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -1528,11 +1452,11 @@
    <xs:complexType name="oscal-metadata-metadata-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Publication metadata</m:formal-name>
-            <m:description>Provides information about the publication and availability of the containing document.</m:description>
+            <m:formal-name>Document Metadata</m:formal-name>
+            <m:description>Provides information about the containing document, and defines concepts that are shared across the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication metadata</b>: Provides information about the publication and availability of the containing document.</xs:documentation>
+            <b>Document Metadata</b>: Provides information about the containing document, and defines concepts that are shared across the document.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="1" maxOccurs="1">
@@ -1551,473 +1475,477 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-published-FIELD"
+                      minOccurs="0"
+                      maxOccurs="1"/>
          <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-last-modified-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
+                      type="oscal-metadata-oscal-version-FIELD"
+                      minOccurs="1"
+                      maxOccurs="1"/>
          <xs:element name="revisions" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:sequence>
-                  <xs:element name="revision"
-                              type="oscal-metadata-revision-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
-               </xs:sequence>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="document-id"
-                     type="oscal-metadata-document-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="role"
-                     type="oscal-metadata-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="location"
-                     type="oscal-metadata-location-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="party"
-                     type="oscal-metadata-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:formal-name>revisions</m:formal-name>
+                  <m:description>A group of 'revision' elements</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>revisions</b>: A group of 'revision' elements</xs:documentation>
             </xs:annotation>
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-revision-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Revision History Entry</m:formal-name>
-            <m:description>An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document in reverse chronological order (i.e., most recent previous revision first).</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Document Title</m:formal-name>
-                     <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="revision" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Revision History Entry</m:formal-name>
+                              <m:description>An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Revision History Entry</b>: An entry in a sequential list of revisions to the containing document, expected to be in reverse chronological order (i.e. latest first).</xs:documentation>
+                        </xs:annotation>
+                        <xs:sequence>
+                           <xs:element name="title" minOccurs="0" maxOccurs="1">
+                              <xs:complexType mixed="true">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>Document Title</m:formal-name>
+                                       <m:description>A name given to the document revision, which may be used by a tool for display and navigation.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>Document Title</b>: A name given to the document revision, which may be used by a tool for display and navigation.</xs:documentation>
+                                 </xs:annotation>
+                                 <xs:complexContent>
+                                    <xs:extension base="MarkupLineDatatype"/>
+                                 </xs:complexContent>
+                              </xs:complexType>
+                           </xs:element>
+                           <xs:element name="published"
+                                        type="oscal-metadata-published-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="last-modified"
+                                        type="oscal-metadata-last-modified-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="version"
+                                        type="oscal-metadata-version-FIELD"
+                                        minOccurs="1"
+                                        maxOccurs="1"/>
+                           <xs:element name="oscal-version"
+                                        type="oscal-metadata-oscal-version-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="1"/>
+                           <xs:element name="prop"
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="link"
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
+                           <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                              <xs:annotation>
+                                 <xs:appinfo>
+                                    <m:formal-name>Remarks</m:formal-name>
+                                    <m:description>Additional commentary about the containing object.</m:description>
+                                 </xs:appinfo>
+                                 <xs:documentation>
+                                    <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                              </xs:annotation>
+                              <xs:complexType>
+                                 <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                              </xs:complexType>
+                           </xs:element>
+                        </xs:sequence>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
             </xs:complexType>
          </xs:element>
-         <xs:element name="published"
-                     type="oscal-metadata-published-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="last-modified"
-                     type="oscal-metadata-last-modified-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
-         <xs:element name="version"
-                     type="oscal-metadata-version-FIELD"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="oscal-version"
-                     type="oscal-metadata-oscal-version-FIELD"
-                     minOccurs="0"
-                     maxOccurs="1"/>
+         <xs:element name="document-id"
+                      type="oscal-metadata-document-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="role" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-   </xs:complexType>
-   <xs:complexType name="oscal-metadata-location-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location</m:formal-name>
-            <m:description>A location, with associated metadata that can be referenced.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location</b>: A location, with associated metadata that can be referenced.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="0" maxOccurs="1">
-            <xs:complexType mixed="true">
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location Title</m:formal-name>
-                     <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                     <m:formal-name>Role</m:formal-name>
+                     <m:description>Defines a function, which might be assigned to a party in a specific situation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Role</b>: Defines a function, which might be assigned to a party in a specific situation.</xs:documentation>
                </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="1" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Title</m:formal-name>
+                              <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="description" minOccurs="0" maxOccurs="1">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Role Description</m:formal-name>
+                              <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupMultilineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="id" use="required" type="TokenDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Role Identifier</m:formal-name>
+                        <m:description>A unique identifier for the role.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Role Identifier</b>: A unique identifier for the role.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="address"
-                     type="oscal-metadata-address-ASSEMBLY"
-                     minOccurs="1"
-                     maxOccurs="1"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
+         <xs:element name="location" minOccurs="0" maxOccurs="unbounded">
+            <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Location URL</m:formal-name>
-                     <m:description>The uniform resource locator (URL) for a web site or Internet presence associated with the location.</m:description>
+                     <m:formal-name>Location</m:formal-name>
+                     <m:description>A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Location URL</b>: The uniform resource locator (URL) for a web site or Internet presence associated with the location.</xs:documentation>
+                     <b>Location</b>: A physical point of presence, which may be associated with people, organizations, or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:restriction base="URIDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Location Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined location elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>location</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Location Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined location elsewhere in this or other OSCAL instances. The locally defined UUID of the location can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
-   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Location Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>location</code> defined in the <code>metadata</code> section of this or another OSCAL instance. The <em>UUID</em> of the <code>location</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Location Reference</b>: A machine-oriented identifier reference to a location defined in the metadata section of this or another OSCAL instance. The UUID of the location in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-      </xs:annotation>
-      <xs:restriction base="UUIDDatatype"/>
-   </xs:simpleType>
-   <xs:complexType name="oscal-metadata-party-ASSEMBLY">
-      <xs:annotation>
-         <xs:appinfo>
-            <m:formal-name>Party (organization or person)</m:formal-name>
-            <m:description>A responsible entity which is either a person or an organization.</m:description>
-         </xs:appinfo>
-         <xs:documentation>
-            <b>Party (organization or person)</b>: A responsible entity which is either a person or an organization.</xs:documentation>
-      </xs:annotation>
-      <xs:sequence>
-         <xs:element name="name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Name</m:formal-name>
-                     <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Party Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
+               <xs:sequence>
+                  <xs:element name="title" minOccurs="0" maxOccurs="1">
+                     <xs:complexType mixed="true">
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location Title</m:formal-name>
+                              <m:description>A name given to the location, which may be used by a tool for display and navigation.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location Title</b>: A name given to the location, which may be used by a tool for display and navigation.</xs:documentation>
+                        </xs:annotation>
+                        <xs:complexContent>
+                           <xs:extension base="MarkupLineDatatype"/>
+                        </xs:complexContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="address"
+                               type="oscal-metadata-address-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="1"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="url" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Location URL</m:formal-name>
+                              <m:description>The uniform resource locator (URL) for a web site or other resource associated with the location.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Location URL</b>: The uniform resource locator (URL) for a web site or other resource associated with the location.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="URIDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Location Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique ID for the location, for reference.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Location Universally Unique Identifier</b>: A unique ID for the location, for reference.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+            </xs:complexType>
          </xs:element>
-         <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+         <xs:element name="party" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
                   <xs:appinfo>
-                     <m:formal-name>Party External Identifier</m:formal-name>
-                     <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</m:description>
+                     <m:formal-name>Party</m:formal-name>
+                     <m:description>An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID)</xs:documentation>
+                     <b>Party</b>: An organization or person, which may be associated with roles or other concepts within the current or linked OSCAL document.</xs:documentation>
                </xs:annotation>
-               <xs:simpleContent>
-                  <xs:extension base="StringDatatype">
-                     <xs:attribute name="scheme" use="required" type="URIDatatype">
+               <xs:sequence>
+                  <xs:element name="name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
                         <xs:annotation>
                            <xs:appinfo>
-                              <m:formal-name>External Identifier Schema</m:formal-name>
-                              <m:description>Indicates the type of external identifier.</m:description>
+                              <m:formal-name>Party Name</m:formal-name>
+                              <m:description>The full name of the party. This is typically the legal name associated with the party.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                              <b>Party Name</b>: The full name of the party. This is typically the legal name associated with the party.</xs:documentation>
                         </xs:annotation>
-                     </xs:attribute>
-                  </xs:extension>
-               </xs:simpleContent>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="short-name" minOccurs="0" maxOccurs="1">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party Short Name</m:formal-name>
+                              <m:description>A short common name, abbreviation, or acronym for the party.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party Short Name</b>: A short common name, abbreviation, or acronym for the party.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="StringDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="external-id" minOccurs="0" maxOccurs="unbounded">
+                     <xs:complexType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Party External Identifier</m:formal-name>
+                              <m:description>An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Party External Identifier</b>: An identifier for a person or organization using a designated scheme. e.g. an Open Researcher and Contributor ID (ORCID).</xs:documentation>
+                        </xs:annotation>
+                        <xs:simpleContent>
+                           <xs:extension base="StringDatatype">
+                              <xs:attribute name="scheme" use="required" type="URIDatatype">
+                                 <xs:annotation>
+                                    <xs:appinfo>
+                                       <m:formal-name>External Identifier Schema</m:formal-name>
+                                       <m:description>Indicates the type of external identifier.</m:description>
+                                    </xs:appinfo>
+                                    <xs:documentation>
+                                       <b>External Identifier Schema</b>: Indicates the type of external identifier.</xs:documentation>
+                                 </xs:annotation>
+                              </xs:attribute>
+                           </xs:extension>
+                        </xs:simpleContent>
+                     </xs:complexType>
+                  </xs:element>
+                  <xs:element name="prop"
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="link"
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="email-address"
+                               type="oscal-metadata-email-address-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:element name="telephone-number"
+                               type="oscal-metadata-telephone-number-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
+                  <xs:choice>
+                     <xs:element name="address"
+                                  type="oscal-metadata-address-ASSEMBLY"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                     <xs:element name="location-uuid"
+                                  type="oscal-metadata-location-uuid-FIELD"
+                                  minOccurs="0"
+                                  maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
+                     <xs:simpleType>
+                        <xs:annotation>
+                           <xs:appinfo>
+                              <m:formal-name>Organizational Affiliation</m:formal-name>
+                              <m:description>A reference to another <code>party</code> by UUID, typically an organization, that this subject is associated with.</m:description>
+                           </xs:appinfo>
+                           <xs:documentation>
+                              <b>Organizational Affiliation</b>: A reference to another party by UUID, typically an organization, that this subject is associated with.</xs:documentation>
+                        </xs:annotation>
+                        <xs:restriction base="UUIDDatatype"/>
+                     </xs:simpleType>
+                  </xs:element>
+                  <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+                     <xs:annotation>
+                        <xs:appinfo>
+                           <m:formal-name>Remarks</m:formal-name>
+                           <m:description>Additional commentary about the containing object.</m:description>
+                        </xs:appinfo>
+                        <xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+                     </xs:annotation>
+                     <xs:complexType>
+                        <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+                     </xs:complexType>
+                  </xs:element>
+               </xs:sequence>
+               <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Universally Unique Identifier</m:formal-name>
+                        <m:description>A unique identifier for the party.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Universally Unique Identifier</b>: A unique identifier for the party.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
+               <xs:attribute name="type" use="required" type="StringDatatype">
+                  <xs:annotation>
+                     <xs:appinfo>
+                        <m:formal-name>Party Type</m:formal-name>
+                        <m:description>A category describing the kind of party the object describes.</m:description>
+                     </xs:appinfo>
+                     <xs:documentation>
+                        <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
+                  </xs:annotation>
+               </xs:attribute>
             </xs:complexType>
          </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="email-address"
-                     type="oscal-metadata-email-address-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="telephone-number"
-                     type="oscal-metadata-telephone-number-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:choice>
-            <xs:element name="address"
-                        type="oscal-metadata-address-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-            <xs:element name="location-uuid"
-                        type="oscal-metadata-location-uuid-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
-         </xs:choice>
-         <xs:element name="member-of-organization" minOccurs="0" maxOccurs="unbounded">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Organizational Affiliation</m:formal-name>
-                     <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> (<code>person</code> or <code>organization</code>) that this subject is associated with. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Organizational Affiliation</b>: A machine-oriented identifier reference to another party (person or organization) that this subject is associated with. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="UUIDDatatype"/>
-            </xs:simpleType>
-         </xs:element>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="action"
+                      type="oscal-metadata-action-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
             </xs:complexType>
          </xs:element>
       </xs:sequence>
-      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined party elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>party</code> can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined party elsewhere in this or other OSCAL instances. The locally defined UUID of the party can be used to reference the data item locally or globally (e.g., from an importing OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="type" use="required" type="StringDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Party Type</m:formal-name>
-               <m:description>A category describing the kind of party the object describes.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Party Type</b>: A category describing the kind of party the object describes.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
    </xs:complexType>
-   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
+   <xs:simpleType name="oscal-metadata-location-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Party Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to another <code>party</code> defined in <code>metadata</code>. The <em>UUID</em> of the <code>party</code> in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </m:description>
+            <m:formal-name>Location Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a location by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Party Reference</b>: A machine-oriented identifier reference to another party defined in metadata. The UUID of the party in the source OSCAL instance is sufficient to reference the data item locally or globally (e.g., in an imported OSCAL instance). </xs:documentation>
+            <b>Location Universally Unique Identifier Reference</b>: Reference to a location by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="UUIDDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-metadata-role-ASSEMBLY">
+   <xs:simpleType name="oscal-metadata-party-uuid-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>Role</m:formal-name>
-            <m:description>Defines a function assumed or expected to be assumed by a party in a specific situation.</m:description>
+            <m:formal-name>Party Universally Unique Identifier Reference</m:formal-name>
+            <m:description>Reference to a party by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role</b>: Defines a function assumed or expected to be assumed by a party in a specific situation.</xs:documentation>
+            <b>Party Universally Unique Identifier Reference</b>: Reference to a party by UUID.</xs:documentation>
       </xs:annotation>
-      <xs:sequence>
-         <xs:element name="title" minOccurs="1" maxOccurs="1">
-            <xs:complexType mixed="true">
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Title</m:formal-name>
-                     <m:description>A name given to the role, which may be used by a tool for display and navigation.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Title</b>: A name given to the role, which may be used by a tool for display and navigation.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupLineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="short-name" minOccurs="0" maxOccurs="1">
-            <xs:simpleType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Short Name</m:formal-name>
-                     <m:description>A short common name, abbreviation, or acronym for the role.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Short Name</b>: A short common name, abbreviation, or acronym for the role.</xs:documentation>
-               </xs:annotation>
-               <xs:restriction base="StringDatatype"/>
-            </xs:simpleType>
-         </xs:element>
-         <xs:element name="description" minOccurs="0" maxOccurs="1">
-            <xs:complexType>
-               <xs:annotation>
-                  <xs:appinfo>
-                     <m:formal-name>Role Description</m:formal-name>
-                     <m:description>A summary of the role's purpose and associated responsibilities.</m:description>
-                  </xs:appinfo>
-                  <xs:documentation>
-                     <b>Role Description</b>: A summary of the role's purpose and associated responsibilities.</xs:documentation>
-               </xs:annotation>
-               <xs:complexContent>
-                  <xs:extension base="MarkupMultilineDatatype"/>
-               </xs:complexContent>
-            </xs:complexType>
-         </xs:element>
-         <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
-            <xs:annotation>
-               <xs:appinfo>
-                  <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
-               </xs:appinfo>
-               <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
-            </xs:annotation>
-            <xs:complexType>
-               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
-            </xs:complexType>
-         </xs:element>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="TokenDatatype">
-         <xs:annotation>
-            <xs:appinfo>
-               <m:formal-name>Role Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined role elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, the locally defined <em>ID</em> of the <code>Role</code> from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
-            </xs:appinfo>
-            <xs:documentation>
-               <b>Role Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined role elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, the locally defined ID of the Role from the imported OSCAL instance must be referenced in the context of the containing resource (e.g., import, import-component-definition, import-profile, import-ssp or import-ap). This ID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-   </xs:complexType>
+      <xs:restriction base="UUIDDatatype"/>
+   </xs:simpleType>
    <xs:simpleType name="oscal-metadata-role-id-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Role Identifier Reference</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+            <m:description>Reference to a role by UUID.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Role Identifier Reference</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+            <b>Role Identifier Reference</b>: Reference to a role by UUID.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="TokenDatatype"/>
    </xs:simpleType>
@@ -2025,10 +1953,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Back matter</m:formal-name>
-            <m:description>A collection of resources, which may be included directly or by reference.</m:description>
+            <m:description>A collection of resources that may be referenced from within the OSCAL document instance.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Back matter</b>: A collection of resources, which may be included directly or by reference.</xs:documentation>
+            <b>Back matter</b>: A collection of resources that may be referenced from within the OSCAL document instance.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="resource" minOccurs="0" maxOccurs="unbounded">
@@ -2036,10 +1964,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Resource</m:formal-name>
-                     <m:description>A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</m:description>
+                     <m:description>A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Resource</b>: A resource associated with content in the containing document. A resource may be directly included in the document base64 encoded or may point to one or more equivalent internet resources.</xs:documentation>
+                     <b>Resource</b>: A resource associated with content in the containing document instance. A resource may be directly included in the document using base64 encoding or may point to one or more equivalent internet resources.</xs:documentation>
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -2047,10 +1975,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Title</m:formal-name>
-                              <m:description>A name given to the resource, which may be used by a tool for display and navigation.</m:description>
+                              <m:description>An optional name given to the resource, which may be used by a tool for display and navigation.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Title</b>: A name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
+                              <b>Resource Title</b>: An optional name given to the resource, which may be used by a tool for display and navigation.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupLineDatatype"/>
@@ -2062,10 +1990,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource Description</m:formal-name>
-                              <m:description>A short summary of the resource used to indicate the purpose of the resource.</m:description>
+                              <m:description>An optional short summary of the resource used to indicate the purpose of the resource.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource Description</b>: A short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
+                              <b>Resource Description</b>: An optional short summary of the resource used to indicate the purpose of the resource.</xs:documentation>
                         </xs:annotation>
                         <xs:complexContent>
                            <xs:extension base="MarkupMultilineDatatype"/>
@@ -2073,22 +2001,22 @@
                      </xs:complexType>
                   </xs:element>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="document-id"
-                              type="oscal-metadata-document-id-FIELD"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-document-id-FIELD"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="citation" minOccurs="0" maxOccurs="1">
                      <xs:complexType>
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Citation</m:formal-name>
-                              <m:description>A citation consisting of end note text and optional structured bibliographic data.</m:description>
+                              <m:description>An optional citation consisting of end note text using structured markup.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Citation</b>: A citation consisting of end note text and optional structured bibliographic data.</xs:documentation>
+                              <b>Citation</b>: An optional citation consisting of end note text using structured markup.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="text" minOccurs="1" maxOccurs="1">
@@ -2107,13 +2035,13 @@
                               </xs:complexType>
                            </xs:element>
                            <xs:element name="prop"
-                                       type="oscal-metadata-property-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-property-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                            <xs:element name="link"
-                                       type="oscal-metadata-link-ASSEMBLY"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-link-ASSEMBLY"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                      </xs:complexType>
                   </xs:element>
@@ -2122,35 +2050,35 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Resource link</m:formal-name>
-                              <m:description>A pointer to an external resource with an optional hash for verification and change detection.</m:description>
+                              <m:description>A URL-based pointer to an external resource with an optional hash for verification and change detection.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Resource link</b>: A pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
+                              <b>Resource link</b>: A URL-based pointer to an external resource with an optional hash for verification and change detection.</xs:documentation>
                         </xs:annotation>
                         <xs:sequence>
                            <xs:element name="hash"
-                                       type="oscal-metadata-hash-FIELD"
-                                       minOccurs="0"
-                                       maxOccurs="unbounded"/>
+                                        type="oscal-metadata-hash-FIELD"
+                                        minOccurs="0"
+                                        maxOccurs="unbounded"/>
                         </xs:sequence>
                         <xs:attribute name="href" use="required" type="URIReferenceDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Hypertext Reference</m:formal-name>
-                                 <m:description>A resolvable URI reference to a resource.</m:description>
+                                 <m:description>A resolvable URL pointing to the referenced resource.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Hypertext Reference</b>: A resolvable URI reference to a resource.</xs:documentation>
+                                 <b>Hypertext Reference</b>: A resolvable URL pointing to the referenced resource.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                         <xs:attribute name="media-type" type="StringDatatype">
                            <xs:annotation>
                               <xs:appinfo>
                                  <m:formal-name>Media Type</m:formal-name>
-                                 <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                 <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                               </xs:appinfo>
                               <xs:documentation>
-                                 <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                 <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                            </xs:annotation>
                         </xs:attribute>
                      </xs:complexType>
@@ -2160,14 +2088,14 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Base64</m:formal-name>
-                              <m:description>The Base64 alphabet in RFC 2045 - aligned with XSD.</m:description>
+                              <m:description>A resource encoded using the Base64 alphabet defined by <a href="https://www.rfc-editor.org/rfc/rfc2045.html">RFC 2045</a>.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Base64</b>: The Base64 alphabet in RFC 2045 - aligned with XSD.</xs:documentation>
+                              <b>Base64</b>: A resource encoded using the Base64 alphabet defined by RFC 2045.</xs:documentation>
                         </xs:annotation>
                         <xs:simpleContent>
                            <xs:extension base="Base64Datatype">
-                              <xs:attribute name="filename" type="URIReferenceDatatype">
+                              <xs:attribute name="filename" type="TokenDatatype">
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>File Name</m:formal-name>
@@ -2181,10 +2109,10 @@
                                  <xs:annotation>
                                     <xs:appinfo>
                                        <m:formal-name>Media Type</m:formal-name>
-                                       <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+                                       <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
                                     </xs:appinfo>
                                     <xs:documentation>
-                                       <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+                                       <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
                                  </xs:annotation>
                               </xs:attribute>
                            </xs:extension>
@@ -2195,10 +2123,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2209,10 +2137,10 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Resource Universally Unique Identifier</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined resource elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+                        <m:description>A unique identifier for a resource.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
-                        <b>Resource Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined resource elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+                        <b>Resource Universally Unique Identifier</b>: A unique identifier for a resource.</xs:documentation>
                   </xs:annotation>
                </xs:attribute>
             </xs:complexType>
@@ -2223,20 +2151,20 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Property</m:formal-name>
-            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</m:description>
+            <m:description>An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair. The value of a property is a simple scalar value, which may be expressed as a list of values.</xs:documentation>
+            <b>Property</b>: An attribute, characteristic, or quality of the containing object expressed as a namespace qualified name/value pair.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2247,20 +2175,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
+               <m:description>A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Name</b>: A textual label that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
+               <b>Property Name</b>: A textual label, within a namespace, that uniquely identifies a specific attribute, characteristic, or quality of the property's containing object.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for a property.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this defined property elsewhere in this or other OSCAL instances. This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Property Universally Unique Identifier</b>: A unique identifier for a property.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
@@ -2287,10 +2215,20 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Property Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>A textual label that provides a sub-type or characterization of the property's <code>name</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name. This can be used to further distinguish or discriminate between the semantics of multiple properties of the same object with the same name and ns. </xs:documentation>
+               <b>Property Class</b>: A textual label that provides a sub-type or characterization of the property's name.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="group" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Property Group</m:formal-name>
+               <m:description>An identifier for relating distinct sets of properties.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Property Group</b>: An identifier for relating distinct sets of properties.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2298,10 +2236,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Link</m:formal-name>
-            <m:description>A reference to a local or remote resource</m:description>
+            <m:description>A reference to a local or remote resource, that has a specific relation to the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Link</b>: A reference to a local or remote resource</xs:documentation>
+            <b>Link</b>: A reference to a local or remote resource, that has a specific relation to the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="text" minOccurs="0" maxOccurs="1">
@@ -2333,21 +2271,31 @@
       <xs:attribute name="rel" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
-               <m:formal-name>Relation</m:formal-name>
-               <m:description>Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</m:description>
+               <m:formal-name>Link Relation Type</m:formal-name>
+               <m:description>Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Relation</b>: Describes the type of relationship provided by the link. This can be an indicator of the link's purpose.</xs:documentation>
+               <b>Link Relation Type</b>: Describes the type of relationship provided by the link's hypertext reference. This can be an indicator of the link's purpose.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="media-type" type="StringDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Media Type</m:formal-name>
-               <m:description>Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">Media Types Registry</a>. </m:description>
+               <m:description>A label that indicates the nature of a resource, as a data serialization or format.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Media Type</b>: Specifies a media type as defined by the Internet Assigned Numbers Authority (IANA) Media Types Registry. </xs:documentation>
+               <b>Media Type</b>: A label that indicates the nature of a resource, as a data serialization or format.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="resource-fragment" type="StringDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Resource Fragment</m:formal-name>
+               <m:description>In case where the <code>href</code> points to a <code>back-matter/resource</code>, this value will indicate the URI <a href="https://www.rfc-editor.org/rfc/rfc3986#section-3.5">fragment</a> to append to any <code>rlink</code> associated with the resource. This value MUST be <a href="https://www.rfc-editor.org/rfc/rfc3986#section-2.1">URI encoded</a>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Resource Fragment</b>: In case where the href points to a back-matter/resource, this value will indicate the URI fragment to append to any rlink associated with the resource. This value MUST be URI encoded.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2355,32 +2303,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Party</m:formal-name>
-            <m:description>A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</m:description>
+            <m:description>A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Party</b>: A reference to a set of organizations or persons that have responsibility for performing a referenced role in the context of the containing object.</xs:documentation>
+            <b>Responsible Party</b>: A reference to a set of persons and/or organizations that have responsibility for performing the referenced role in the context of the containing object.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2391,10 +2339,87 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> served by the user.</m:description>
+               <m:description>A reference to a <code>role</code> performed by a <code>party</code>.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Responsible Role</b>: A reference to a role performed by a party.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+   </xs:complexType>
+   <xs:complexType name="oscal-metadata-action-ASSEMBLY">
+      <xs:annotation>
+         <xs:appinfo>
+            <m:formal-name>Action</m:formal-name>
+            <m:description>An action applied by a role within a given party to the content.</m:description>
+         </xs:appinfo>
+         <xs:documentation>
+            <b>Action</b>: An action applied by a role within a given party to the content.</xs:documentation>
+      </xs:annotation>
+      <xs:sequence>
+         <xs:element name="prop"
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="link"
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="responsible-party"
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
+         <xs:element name="remarks" minOccurs="0" maxOccurs="1">
+            <xs:annotation>
+               <xs:appinfo>
+                  <m:formal-name>Remarks</m:formal-name>
+                  <m:description>Additional commentary about the containing object.</m:description>
+               </xs:appinfo>
+               <xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
+            </xs:annotation>
+            <xs:complexType>
+               <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
+            </xs:complexType>
+         </xs:element>
+      </xs:sequence>
+      <xs:attribute name="uuid" use="required" type="UUIDDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Universally Unique Identifier</m:formal-name>
+               <m:description>A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Universally Unique Identifier</b>: A unique identifier that can be used to reference this defined action elsewhere in an OSCAL document. A UUID should be consistently used for a given location across revisions of the document.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="date" type="DateTimeWithTimezoneDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Occurrence Date</m:formal-name>
+               <m:description>The date and time when the action occurred.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Occurrence Date</b>: The date and time when the action occurred.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="type" use="required" type="TokenDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type</m:formal-name>
+               <m:description>The type of action documented by the assembly, such as an approval.</m:description>
+            </xs:appinfo>
+            <xs:documentation>
+               <b>Action Type</b>: The type of action documented by the assembly, such as an approval.</xs:documentation>
+         </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="system" use="required" type="URIDatatype">
+         <xs:annotation>
+            <xs:appinfo>
+               <m:formal-name>Action Type System</m:formal-name>
+               <m:description>Specifies the action type system used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role</b>: A human-oriented identifier reference to roles served by the user.</xs:documentation>
+               <b>Action Type System</b>: Specifies the action type system used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2402,32 +2427,32 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Responsible Role</m:formal-name>
-            <m:description>A reference to one or more roles with responsibility for performing a function relative to the containing object.</m:description>
+            <m:description>A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Responsible Role</b>: A reference to one or more roles with responsibility for performing a function relative to the containing object.</xs:documentation>
+            <b>Responsible Role</b>: A reference to a role with responsibility for performing a function relative to the containing object, optionally associated with a set of persons and/or organizations that perform that role.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="party-uuid"
-                     type="oscal-metadata-party-uuid-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-party-uuid-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2438,10 +2463,10 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Responsible Role ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to <code>roles</code> responsible for the business function.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> identifier reference to a <code>role</code> performed.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Responsible Role ID</b>: A human-oriented identifier reference to roles responsible for the business function.</xs:documentation>
+               <b>Responsible Role ID</b>: A human-oriented identifier reference to a role performed.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
@@ -2460,10 +2485,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Hash algorithm</m:formal-name>
-                     <m:description>Method by which a hash is derived</m:description>
+                     <m:description>The digest method by which a hash is derived.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Hash algorithm</b>: Method by which a hash is derived</xs:documentation>
+                     <b>Hash algorithm</b>: The digest method by which a hash is derived.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -2473,10 +2498,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Remarks</m:formal-name>
-            <m:description>Additional commentary on the containing object.</m:description>
+            <m:description>Additional commentary about the containing object.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+            <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
       </xs:annotation>
       <xs:complexContent>
          <xs:extension base="MarkupMultilineDatatype"/>
@@ -2486,10 +2511,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Publication Timestamp</m:formal-name>
-            <m:description>The date and time the document was published. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last made available.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Publication Timestamp</b>: The date and time the document was published. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Publication Timestamp</b>: The date and time the document was last made available.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -2497,10 +2522,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Last Modified Timestamp</m:formal-name>
-            <m:description>The date and time the document was last modified. The date-time value must be formatted according to <a href="https://tools.ietf.org/html/rfc3339">RFC 3339</a> with full time and time zone included.</m:description>
+            <m:description>The date and time the document was last stored for later retrieval.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Last Modified Timestamp</b>: The date and time the document was last modified. The date-time value must be formatted according to RFC 3339 with full time and time zone included.</xs:documentation>
+            <b>Last Modified Timestamp</b>: The date and time the document was last stored for later retrieval.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="DateTimeWithTimezoneDatatype"/>
    </xs:simpleType>
@@ -2508,21 +2533,21 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Version</m:formal-name>
-            <m:description>A string used to distinguish the current version of the document from other previous (and future) versions.</m:description>
+            <m:description>Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Version</b>: A string used to distinguish the current version of the document from other previous (and future) versions.</xs:documentation>
+            <b>Document Version</b>: Used to distinguish a specific revision of an OSCAL document from other previous and future versions.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
    <xs:simpleType name="oscal-metadata-oscal-version-FIELD">
       <xs:annotation>
          <xs:appinfo>
-            <m:formal-name>OSCAL version</m:formal-name>
-            <m:description>The OSCAL model version the document was authored against.</m:description>
+            <m:formal-name>OSCAL Version</m:formal-name>
+            <m:description>The OSCAL model version the document was authored against and will conform to as valid.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>OSCAL version</b>: The OSCAL model version the document was authored against.</xs:documentation>
+            <b>OSCAL Version</b>: The OSCAL model version the document was authored against and will conform to as valid.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
@@ -2530,10 +2555,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Email Address</m:formal-name>
-            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>. </m:description>
+            <m:description>An email address as defined by <a href="https://tools.ietf.org/html/rfc5322#section-3.4.1">RFC 5322 Section 3.4.1</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1. </xs:documentation>
+            <b>Email Address</b>: An email address as defined by RFC 5322 Section 3.4.1.</xs:documentation>
       </xs:annotation>
       <xs:restriction base="EmailAddressDatatype"/>
    </xs:simpleType>
@@ -2541,10 +2566,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Telephone Number</m:formal-name>
-            <m:description>Contact number by telephone.</m:description>
+            <m:description>A telephone service number as defined by <a href="https://www.itu.int/rec/T-REC-E.164-201011-I/en">ITU-T E.164</a>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Telephone Number</b>: Contact number by telephone.</xs:documentation>
+            <b>Telephone Number</b>: A telephone service number as defined by ITU-T E.164.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -2572,9 +2597,9 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="addr-line"
-                     type="oscal-metadata-addr-line-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-addr-line-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="city" minOccurs="0" maxOccurs="1">
             <xs:simpleType>
                <xs:annotation>
@@ -2593,10 +2618,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>State</m:formal-name>
-                     <m:description>State, province or analogous geographical region for mailing address</m:description>
+                     <m:description>State, province or analogous geographical region for a mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>State</b>: State, province or analogous geographical region for mailing address</xs:documentation>
+                     <b>State</b>: State, province or analogous geographical region for a mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -2606,10 +2631,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Postal Code</m:formal-name>
-                     <m:description>Postal or ZIP code for mailing address</m:description>
+                     <m:description>Postal or ZIP code for mailing address.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Postal Code</b>: Postal or ZIP code for mailing address</xs:documentation>
+                     <b>Postal Code</b>: Postal or ZIP code for mailing address.</xs:documentation>
                </xs:annotation>
                <xs:restriction base="StringDatatype"/>
             </xs:simpleType>
@@ -2654,10 +2679,10 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Document Identifier</m:formal-name>
-            <m:description>A document identifier qualified by an identifier <code>scheme</code>. A document identifier provides a <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with a <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</m:description>
+            <m:description>A document identifier qualified by an identifier <code>scheme</code>.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme. A document identifier provides a globally unique identifier with a cross-instance scope that is used for a group of documents that are to be treated as different versions of the same document. If this element does not appear, or if the value of this element is empty, the value of "document-id" is equal to the value of the "uuid" flag of the top-level root element.</xs:documentation>
+            <b>Document Identifier</b>: A document identifier qualified by an identifier scheme.</xs:documentation>
       </xs:annotation>
       <xs:simpleContent>
          <xs:extension base="StringDatatype">
@@ -2665,10 +2690,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Document Identification Scheme</m:formal-name>
-                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </m:description>
+                     <m:description>Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters. </xs:documentation>
+                     <b>Document Identification Scheme</b>: Qualifies the kind of document identifier using a URI. If the scheme is not provided the value of the element will be interpreted as a string of characters.</xs:documentation>
                </xs:annotation>
             </xs:attribute>
          </xs:extension>
@@ -2730,13 +2755,13 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="status" minOccurs="1" maxOccurs="1">
             <xs:complexType>
                <xs:annotation>
@@ -2752,10 +2777,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2775,21 +2800,21 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="responsible-role"
-                     type="oscal-metadata-responsible-role-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-role-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="protocol"
-                     type="oscal-implementation-common-protocol-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-protocol-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2800,7 +2825,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Component Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this component elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>component</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Component Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this component elsewhere in this or other OSCAL instances. The locally defined UUID of the component can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2843,15 +2868,15 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="port-range"
-                     type="oscal-implementation-common-port-range-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-port-range-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="uuid" type="UUIDDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Service Protocol Information Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this service protocol information elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>service protocol</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Service Protocol Information Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this service protocol information elsewhere in this or other OSCAL instances. The locally defined UUID of the service protocol can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -2922,10 +2947,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -2997,29 +3022,29 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="role-id"
-                     type="oscal-metadata-role-id-FIELD"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-role-id-FIELD"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="authorized-privilege"
-                     type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-authorized-privilege-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3030,7 +3055,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>User Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this user class elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>system user</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>User Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this user class elsewhere in this or other OSCAL instances. The locally defined UUID of the system user can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3078,9 +3103,9 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="function-performed"
-                     type="oscal-implementation-common-function-performed-FIELD"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="oscal-implementation-common-function-performed-FIELD"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:simpleType name="oscal-implementation-common-function-performed-FIELD">
@@ -3120,17 +3145,17 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="responsible-party"
-                     type="oscal-metadata-responsible-party-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-responsible-party-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="implemented-component" minOccurs="0" maxOccurs="unbounded">
             <xs:complexType>
                <xs:annotation>
@@ -3143,25 +3168,25 @@
                </xs:annotation>
                <xs:sequence>
                   <xs:element name="prop"
-                              type="oscal-metadata-property-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-property-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="link"
-                              type="oscal-metadata-link-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-link-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="responsible-party"
-                              type="oscal-metadata-responsible-party-ASSEMBLY"
-                              minOccurs="0"
-                              maxOccurs="unbounded"/>
+                               type="oscal-metadata-responsible-party-ASSEMBLY"
+                               minOccurs="0"
+                               maxOccurs="unbounded"/>
                   <xs:element name="remarks" minOccurs="0" maxOccurs="1">
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3172,7 +3197,7 @@
                   <xs:annotation>
                      <xs:appinfo>
                         <m:formal-name>Component Universally Unique Identifier Reference</m:formal-name>
-                        <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
+                        <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a> identifier reference to a <code>component</code> that is implemented as part of an inventory item.</m:description>
                      </xs:appinfo>
                      <xs:documentation>
                         <b>Component Universally Unique Identifier Reference</b>: A machine-oriented identifier reference to a component that is implemented as part of an inventory item.</xs:documentation>
@@ -3184,10 +3209,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3198,7 +3223,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Inventory Item Universally Unique Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#machine-oriented">machine-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this inventory item elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. The locally defined <em>UUID</em> of the <code>inventory item</code> can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Inventory Item Universally Unique Identifier</b>: A machine-oriented, globally unique identifier with cross-instance scope that can be used to reference this inventory item elsewhere in this or other OSCAL instances. The locally defined UUID of the inventory item can be used to reference the data item locally or globally (e.g., in an imported OSCAL instance). This UUID should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
@@ -3232,10 +3257,10 @@
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3246,7 +3271,7 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter ID</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
+               <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a> reference to a <code>parameter</code> within a control, who's catalog has been imported into the current implementation context.</m:description>
             </xs:appinfo>
             <xs:documentation>
                <b>Parameter ID</b>: A human-oriented reference to a parameter within a control, who's catalog has been imported into the current implementation context.</xs:documentation>
@@ -3257,7 +3282,7 @@
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>System Identification</m:formal-name>
-            <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
+            <m:description>A <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#globally-unique">globally unique</a> identifier with <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this system identification property elsewhere in <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referencing an externally defined <code>system identification</code>, the <code>system identification</code> must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned <a href="https://pages.nist.gov/OSCAL/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same system across revisions of the document.</m:description>
          </xs:appinfo>
          <xs:documentation>
             <b>System Identification</b>: A human-oriented, globally unique identifier with cross-instance scope that can be used to reference this system identification property elsewhere in this or other OSCAL instances. When referencing an externally defined system identification, the system identification must be used in the context of the external / imported OSCAL instance (e.g., uri-reference). This string should be assigned per-subject, which means it should be consistently used to identify the same system across revisions of the document.</xs:documentation>
@@ -3277,14 +3302,14 @@
          </xs:extension>
       </xs:simpleContent>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-part-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-part-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Part</m:formal-name>
-            <m:description>A partition of a control's definition or a child of another part.</m:description>
+            <m:description>An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Part</b>: A partition of a control's definition or a child of another part.</xs:documentation>
+            <b>Part</b>: An annotated, markup-based textual element of a control's or catalog group's definition, or a child of another part.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="title" minOccurs="0" maxOccurs="1">
@@ -3292,10 +3317,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Part Title</m:formal-name>
-                     <m:description>A name given to the part, which may be used by a tool for display and navigation.</m:description>
+                     <m:description>An optional name given to the part, which may be used by a tool for display and navigation.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Part Title</b>: A name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
+                     <b>Part Title</b>: An optional name given to the part, which may be used by a tool for display and navigation.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupLineDatatype"/>
@@ -3303,61 +3328,61 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
          <xs:element name="part"
-                     type="oscal-catalog-common-part-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-part-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
       <xs:attribute name="id" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined part elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the part.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined part elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Part Identifier</b>: A unique identifier for the part.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="name" use="required" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Name</m:formal-name>
-               <m:description>A textual label that uniquely identifies the part's semantic type.</m:description>
+               <m:description>A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the <code>ns</code>.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type.</xs:documentation>
+               <b>Part Name</b>: A textual label that uniquely identifies the part's semantic type, which exists in a value space qualified by the ns.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="ns" type="URIDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Namespace</m:formal-name>
-               <m:description>A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</m:description>
+               <m:description>An optional namespace qualifying the part's <code>name</code>. This allows different organizations to associate distinct semantics with the same name.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Namespace</b>: A namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
+               <b>Part Namespace</b>: An optional namespace qualifying the part's name. This allows different organizations to associate distinct semantics with the same name.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Part Class</m:formal-name>
-               <m:description>A textual label that provides a sub-type or characterization of the part's <code>name</code>. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same <code>name</code> and <code>ns</code>. </m:description>
+               <m:description>An optional textual providing a sub-type or characterization of the part's <code>name</code>, or a category to which the part belongs.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Part Class</b>: A textual label that provides a sub-type or characterization of the part's name. This can be used to further distinguish or discriminate between the semantics of multiple parts of the same control with the same name and ns. </xs:documentation>
+               <b>Part Class</b>: An optional textual providing a sub-type or characterization of the part's name, or a category to which the part belongs.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter</m:formal-name>
@@ -3368,13 +3393,13 @@
       </xs:annotation>
       <xs:sequence>
          <xs:element name="prop"
-                     type="oscal-metadata-property-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-property-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="link"
-                     type="oscal-metadata-link-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-metadata-link-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="label" minOccurs="0" maxOccurs="1">
             <xs:complexType mixed="true">
                <xs:annotation>
@@ -3395,10 +3420,10 @@
                <xs:annotation>
                   <xs:appinfo>
                      <m:formal-name>Parameter Usage Description</m:formal-name>
-                     <m:description>Describes the purpose and use of a parameter</m:description>
+                     <m:description>Describes the purpose and use of a parameter.</m:description>
                   </xs:appinfo>
                   <xs:documentation>
-                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter</xs:documentation>
+                     <b>Parameter Usage Description</b>: Describes the purpose and use of a parameter.</xs:documentation>
                </xs:annotation>
                <xs:complexContent>
                   <xs:extension base="MarkupMultilineDatatype"/>
@@ -3406,31 +3431,31 @@
             </xs:complexType>
          </xs:element>
          <xs:element name="constraint"
-                     type="oscal-catalog-common-parameter-constraint-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-constraint-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:element name="guideline"
-                     type="oscal-catalog-common-parameter-guideline-ASSEMBLY"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
+                      type="oscal-control-common-parameter-guideline-ASSEMBLY"
+                      minOccurs="0"
+                      maxOccurs="unbounded"/>
          <xs:choice>
             <xs:element name="value"
-                        type="oscal-catalog-common-parameter-value-FIELD"
-                        minOccurs="0"
-                        maxOccurs="unbounded"/>
+                         type="oscal-control-common-parameter-value-FIELD"
+                         minOccurs="0"
+                         maxOccurs="unbounded"/>
             <xs:element name="select"
-                        type="oscal-catalog-common-parameter-selection-ASSEMBLY"
-                        minOccurs="0"
-                        maxOccurs="1"/>
+                         type="oscal-control-common-parameter-selection-ASSEMBLY"
+                         minOccurs="0"
+                         maxOccurs="1"/>
          </xs:choice>
          <xs:element name="remarks" minOccurs="0" maxOccurs="1">
             <xs:annotation>
                <xs:appinfo>
                   <m:formal-name>Remarks</m:formal-name>
-                  <m:description>Additional commentary on the containing object.</m:description>
+                  <m:description>Additional commentary about the containing object.</m:description>
                </xs:appinfo>
                <xs:documentation>
-                  <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                  <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
             </xs:annotation>
             <xs:complexType>
                <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3441,41 +3466,42 @@
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Identifier</m:formal-name>
-               <m:description>A <a href="/concepts/identifier-use/#human-oriented">human-oriented</a>, <a href="/concepts/identifier-use/#locally-unique">locally unique</a> identifier with <a href="/concepts/identifier-use/#cross-instance">cross-instance</a> scope that can be used to reference this defined parameter elsewhere in <a href="/concepts/identifier-use/#scope">this or other OSCAL instances</a>. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned <a href="/concepts/identifier-use/#consistency">per-subject</a>, which means it should be consistently used to identify the same subject across revisions of the document.</m:description>
+               <m:description>A unique identifier for the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Identifier</b>: A human-oriented, locally unique identifier with cross-instance scope that can be used to reference this defined parameter elsewhere in this or other OSCAL instances. When referenced from another OSCAL instance, this identifier must be referenced in the context of the containing resource (e.g., import-profile). This id should be assigned per-subject, which means it should be consistently used to identify the same subject across revisions of the document.</xs:documentation>
+               <b>Parameter Identifier</b>: A unique identifier for the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="class" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Parameter Class</m:formal-name>
-               <m:description>A textual label that provides a characterization of the parameter.</m:description>
+               <m:description>A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Parameter Class</b>: A textual label that provides a characterization of the parameter.</xs:documentation>
+               <b>Parameter Class</b>: A textual label that provides a characterization of the type, purpose, use or scope of the parameter.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
       <xs:attribute name="depends-on" type="TokenDatatype">
          <xs:annotation>
             <xs:appinfo>
                <m:formal-name>Depends on</m:formal-name>
-               <m:description>**(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
+               <m:description>
+                  <strong>(deprecated)</strong> Another parameter invoking this one. This construct has been deprecated and should not be used.</m:description>
             </xs:appinfo>
             <xs:documentation>
-               <b>Depends on</b>: **(deprecated)** Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
+               <b>Depends on</b>: (deprecated) Another parameter invoking this one. This construct has been deprecated and should not be used.</xs:documentation>
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-constraint-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-constraint-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Constraint</m:formal-name>
-            <m:description>A formal or informal expression of a constraint or test</m:description>
+            <m:description>A formal or informal expression of a constraint or test.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Constraint</b>: A formal or informal expression of a constraint or test</xs:documentation>
+            <b>Constraint</b>: A formal or informal expression of a constraint or test.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="description" minOccurs="0" maxOccurs="1">
@@ -3509,10 +3535,10 @@
                         <xs:annotation>
                            <xs:appinfo>
                               <m:formal-name>Constraint test</m:formal-name>
-                              <m:description>A formal (executable) expression of a constraint</m:description>
+                              <m:description>A formal (executable) expression of a constraint.</m:description>
                            </xs:appinfo>
                            <xs:documentation>
-                              <b>Constraint test</b>: A formal (executable) expression of a constraint</xs:documentation>
+                              <b>Constraint test</b>: A formal (executable) expression of a constraint.</xs:documentation>
                         </xs:annotation>
                         <xs:restriction base="StringDatatype"/>
                      </xs:simpleType>
@@ -3521,10 +3547,10 @@
                      <xs:annotation>
                         <xs:appinfo>
                            <m:formal-name>Remarks</m:formal-name>
-                           <m:description>Additional commentary on the containing object.</m:description>
+                           <m:description>Additional commentary about the containing object.</m:description>
                         </xs:appinfo>
                         <xs:documentation>
-                           <b>Remarks</b>: Additional commentary on the containing object.</xs:documentation>
+                           <b>Remarks</b>: Additional commentary about the containing object.</xs:documentation>
                      </xs:annotation>
                      <xs:complexType>
                         <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
@@ -3535,7 +3561,7 @@
          </xs:element>
       </xs:sequence>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-parameter-guideline-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-guideline-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Guideline</m:formal-name>
@@ -3548,7 +3574,7 @@
          <xs:group ref="blockElementGroup" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
    </xs:complexType>
-   <xs:simpleType name="oscal-catalog-common-parameter-value-FIELD">
+   <xs:simpleType name="oscal-control-common-parameter-value-FIELD">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Parameter Value</m:formal-name>
@@ -3559,14 +3585,14 @@
       </xs:annotation>
       <xs:restriction base="StringDatatype"/>
    </xs:simpleType>
-   <xs:complexType name="oscal-catalog-common-parameter-selection-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-parameter-selection-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Selection</m:formal-name>
-            <m:description>Presenting a choice among alternatives</m:description>
+            <m:description>Presenting a choice among alternatives.</m:description>
          </xs:appinfo>
          <xs:documentation>
-            <b>Selection</b>: Presenting a choice among alternatives</xs:documentation>
+            <b>Selection</b>: Presenting a choice among alternatives.</xs:documentation>
       </xs:annotation>
       <xs:sequence>
          <xs:element name="choice" minOccurs="0" maxOccurs="unbounded">
@@ -3596,7 +3622,7 @@
          </xs:annotation>
       </xs:attribute>
    </xs:complexType>
-   <xs:complexType name="oscal-catalog-common-include-all-ASSEMBLY">
+   <xs:complexType name="oscal-control-common-include-all-ASSEMBLY">
       <xs:annotation>
          <xs:appinfo>
             <m:formal-name>Include All</m:formal-name>
@@ -3653,9 +3679,9 @@
    <xs:complexType name="listType">
       <xs:sequence>
          <xs:element name="li"
-                     type="listItemType"
-                     minOccurs="1"
-                     maxOccurs="unbounded"/>
+                      type="listItemType"
+                      minOccurs="1"
+                      maxOccurs="unbounded"/>
       </xs:sequence>
    </xs:complexType>
    <xs:complexType name="orderedListType">